different fetcher functions + update dep

Author: phbnf

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/prometheus/client_golang v1.20.5
 	github.com/rs/cors v1.11.1
 	github.com/transparency-dev/formats v0.0.0-20240909113624-7ce4ea605e8b
-	github.com/transparency-dev/trillian-tessera v0.0.0-20240911103714-727b99dc32a7
+	github.com/transparency-dev/trillian-tessera v0.0.0-20241111165037-f123aedf7aed
 	go.etcd.io/bbolt v1.3.11
 	golang.org/x/crypto v0.29.0
 	golang.org/x/mod v0.22.0

go.sum

@@ -969,6 +969,8 @@ github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG
 github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A=
 github.com/transparency-dev/trillian-tessera v0.0.0-20240911103714-727b99dc32a7 h1:8Wg8K8HO2Srmfsk94J2mIADbwhFjL3Bp+OqHJObnYuY=
 github.com/transparency-dev/trillian-tessera v0.0.0-20240911103714-727b99dc32a7/go.mod h1:90QYeyW+bGY0wtDrlfrGU8F/N1h7r+3CAZtVgkQZcqE=
+github.com/transparency-dev/trillian-tessera v0.0.0-20241111165037-f123aedf7aed h1:aTMg++8gf/gWYxRPSKVthreHoWwW9hEiF2z2RgCdDlY=
+github.com/transparency-dev/trillian-tessera v0.0.0-20241111165037-f123aedf7aed/go.mod h1:rY8XWy8NMtSnwxIJnDquXmv404GhPOKXkg+De5aBat8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

modules/dedup/dedup.go

@@ -24,7 +24,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/transparency-dev/trillian-tessera/api/layout"
 	"github.com/transparency-dev/trillian-tessera/client"
 	"k8s.io/klog/v2"
 )
@@ -50,24 +49,24 @@ type LocalBEDedupStorage interface {
 type ParseBundleFunc func([]byte, uint64) ([]LeafIdx, error)
 
 // UpdateFromLog synchronises a local best effort deduplication storage with a log.
-func UpdateFromLog(ctx context.Context, lds LocalBEDedupStorage, t time.Duration, f client.Fetcher, pb ParseBundleFunc) {
+func UpdateFromLog(ctx context.Context, lds LocalBEDedupStorage, t time.Duration, fcp client.CheckpointFetcherFunc, fb client.EntryBundleFetcherFunc, pb ParseBundleFunc) {
 	tck := time.NewTicker(t)
 	defer tck.Stop()
 	for {
 		select {
 		case <-ctx.Done():
 			return
 		case <-tck.C:
-			if err := sync(ctx, lds, pb, f); err != nil {
+			if err := sync(ctx, lds, pb, fcp, fb); err != nil {
 				klog.Warningf("error updating deduplication data: %v", err)
 			}
 		}
 	}
 }
 
 // sync synchronises a deduplication storage with the corresponding log content.
-func sync(ctx context.Context, lds LocalBEDedupStorage, pb ParseBundleFunc, f client.Fetcher) error {
-	cpRaw, err := f(ctx, layout.CheckpointPath)
+func sync(ctx context.Context, lds LocalBEDedupStorage, pb ParseBundleFunc, fcp client.CheckpointFetcherFunc, fb client.EntryBundleFetcherFunc) error {
+	cpRaw, err := fcp(ctx)
 	if err != nil {
 		return fmt.Errorf("error fetching checkpoint: %v", err)
 	}
@@ -91,8 +90,7 @@ func sync(ctx context.Context, lds LocalBEDedupStorage, pb ParseBundleFunc, f cl
 	if ckptSize > oldSize {
 		klog.V(2).Infof("LocalBEDEdup.sync(): log at size %d, dedup database at size %d, startig to sync", ckptSize, oldSize)
 		for i := oldSize / 256; i <= ckptSize/256; i++ {
-			p := fmt.Sprintf("tile/data/%s", layout.NWithSuffix(0, i, ckptSize))
-			eRaw, err := f(ctx, p)
+			eRaw, err := fb(ctx, ckptSize, i)
 			if err != nil {
 				if errors.Is(err, os.ErrNotExist) {
 					return fmt.Errorf("leaf bundle at index %d not found: %v", i, err)