2 files changed, 16 insertions, 3 deletions
diff --git a/pkg/db/trillian.go b/pkg/db/trillian.go
index ab57db6..25b2fb3 100644
--- a/pkg/db/trillian.go
+++ b/pkg/db/trillian.go
@@ -3,6 +3,7 @@ package db
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"git.sigsum.org/sigsum-lib-go/pkg/requests"
 	"git.sigsum.org/sigsum-lib-go/pkg/types"
@@ -173,7 +174,7 @@ func (c *TrillianClient) GetLeaves(ctx context.Context, req *requests.Leaves) (*
 
 func treeHeadFromLogRoot(lr *trillianTypes.LogRootV1) *types.TreeHead {
 	th := types.TreeHead{
-		Timestamp: uint64(lr.TimestampNanos / 1000 / 1000 / 1000),
+		Timestamp: uint64(time.Now().Unix()),
 		TreeSize:  uint64(lr.TreeSize),
 	}
 	copy(th.RootHash[:], lr.RootHash)
diff --git a/pkg/db/trillian_test.go b/pkg/db/trillian_test.go
index a33458f..955fc46 100644
--- a/pkg/db/trillian_test.go
+++ b/pkg/db/trillian_test.go
@@ -1,10 +1,12 @@
 package db
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"reflect"
 	"testing"
+	"time"
 
 	"git.sigsum.org/sigsum-lib-go/pkg/requests"
 	"git.sigsum.org/sigsum-lib-go/pkg/types"
@@ -185,8 +187,18 @@ func TestGetTreeHead(t *testing.T) {
 			if err != nil {
 				return
 			}
-			if got, want := th, table.wantTh; !reflect.DeepEqual(got, want) {
-				t.Errorf("got tree head\n\t%v\nbut wanted\n\t%v\nin test %q", got, want, table.description)
+
+			// we would need a clock that can be mocked to make a nicer test
+			now := uint64(time.Now().Unix())
+			if got, wantLow, wantHigh := th.Timestamp, now-5, now+5; got < wantLow || got > wantHigh {
+				t.Errorf("got tree head with timestamp %d but wanted between [%d, %d] in test %q",
+					got, wantLow, wantHigh, table.description)
+			}
+			if got, want := th.TreeSize, table.wantTh.TreeSize; got != want {
+				t.Errorf("got tree head with tree size %d but wanted %d in test %q", got, want, table.description)
+			}
+			if got, want := th.RootHash[:], table.wantTh.RootHash[:]; !bytes.Equal(got, want) {
+				t.Errorf("got root hash %x but wanted %x in test %q", got, want, table.description)
 			}
 		}()
 	}