Skip to content

Commit 83e15dc

Browse files
committed
fix: tests
1 parent e6281e4 commit 83e15dc

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

x/merkledb/proof_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ func Test_ChangeProof_Syntactic_Verify(t *testing.T) {
11931193

11941194
db, err := getBasicDB()
11951195
require.NoError(err)
1196-
err = db.VerifyChangeProof(context.Background(), tt.proof, tt.start, tt.end, ids.Empty, len(tt.proof.KeyChanges))
1196+
err = db.VerifyChangeProof(context.Background(), tt.proof, tt.start, tt.end, ids.Empty, 10)
11971197
require.ErrorIs(err, tt.expectedErr)
11981198
})
11991199
}

x/sync/manager.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,10 @@ type ManagerConfig struct {
147147
SimultaneousWorkLimit int
148148
Log logging.Logger
149149
TargetRoot ids.ID
150+
BranchFactor merkledb.BranchFactor
150151
StateSyncNodes []ids.NodeID
152+
// If not specified, [merkledb.DefaultHasher] will be used.
153+
Hasher merkledb.Hasher
151154
}
152155

153156
func NewManager(config ManagerConfig, registerer prometheus.Registerer) (*Manager, error) {
@@ -163,6 +166,13 @@ func NewManager(config ManagerConfig, registerer prometheus.Registerer) (*Manage
163166
case config.SimultaneousWorkLimit == 0:
164167
return nil, ErrZeroWorkLimit
165168
}
169+
if err := config.BranchFactor.Valid(); err != nil {
170+
return nil, err
171+
}
172+
173+
if config.Hasher == nil {
174+
config.Hasher = merkledb.DefaultHasher
175+
}
166176

167177
metrics, err := NewMetrics("sync", registerer)
168178
if err != nil {
@@ -174,6 +184,7 @@ func NewManager(config ManagerConfig, registerer prometheus.Registerer) (*Manage
174184
doneChan: make(chan struct{}),
175185
unprocessedWork: newWorkHeap(),
176186
processedWork: newWorkHeap(),
187+
tokenSize: merkledb.BranchFactorToTokenSize[config.BranchFactor],
177188
metrics: metrics,
178189
}
179190
m.unprocessedWorkCond.L = &m.workLock

0 commit comments

Comments
 (0)