Update callers

transparency-dev · Jan 9, 2025 · 3d768c8 · 3d768c8
1 parent 88f6ad5
commit 3d768c8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/storage/aws/aws.go b/storage/aws/aws.go
@@ -428,7 +428,11 @@ func (s *Storage) integrate(ctx context.Context, fromSeq uint64, entries []stora
 	})
 
 	errG.Go(func() error {
-		newSize, root, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, entries)
+		lh := make([][]byte, len(entries))
+		for i, e := range entries {
+			lh[i] = e.LeafHash
+		}
+		newSize, root, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, lh)
 		if err != nil {
 			return fmt.Errorf("Integrate: %v", err)
 		}

diff --git a/storage/gcp/gcp.go b/storage/gcp/gcp.go
@@ -382,7 +382,11 @@ func (s *Storage) integrate(ctx context.Context, fromSeq uint64, entries []stora
 			return n, nil
 		}
 
-		newSize, root, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, entries)
+		lh := make([][]byte, len(entries))
+		for i, e := range entries {
+			lh[i] = e.LeafHash
+		}
+		newSize, root, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, lh)
 		if err != nil {
 			return fmt.Errorf("Integrate: %v", err)
 		}

diff --git a/storage/mysql/mysql.go b/storage/mysql/mysql.go
@@ -501,7 +501,11 @@ func (s *Storage) integrate(ctx context.Context, tx *sql.Tx, fromSeq uint64, ent
 		}
 	}
 
-	newSize, newRoot, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, sequencedEntries)
+	lh := make([][]byte, len(sequencedEntries))
+	for i, e := range sequencedEntries {
+		lh[i] = e.LeafHash
+	}
+	newSize, newRoot, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, lh)
 	if err != nil {
 		return fmt.Errorf("tb.Integrate: %v", err)
 	}

diff --git a/storage/posix/files.go b/storage/posix/files.go
@@ -275,7 +275,11 @@ func (s *Storage) doIntegrate(ctx context.Context, fromSeq uint64, entries []sto
 		return n, nil
 	}
 
-	newSize, newRoot, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, entries)
+	lh := make([][]byte, len(entries))
+	for i, e := range entries {
+		lh[i] = e.LeafHash
+	}
+	newSize, newRoot, tiles, err := storage.Integrate(ctx, getTiles, fromSeq, lh)
 	if err != nil {
 		klog.Errorf("Integrate: %v", err)
 		return fmt.Errorf("Integrate: %v", err)