From f2a9763a6d6b537a71a0de960ff99f448c86baf6 Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Sun, 17 Apr 2022 09:52:05 +0700
Subject: [PATCH] integration: senders check that snapshots are not nil #3905
---
cmd/integration/commands/stages.go | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go
index a35c9dd0e3..dea4d11fff 100644
--- a/cmd/integration/commands/stages.go
+++ b/cmd/integration/commands/stages.go
@@ -576,10 +576,14 @@ func stageSenders(db kv.RwDB, ctx context.Context) error {
s := stage(sync, tx, nil, stages.Senders)
log.Info("Stage", "name", s.ID, "progress", s.BlockNumber)
+ var br *snapshotsync.BlockRetire
snapshots := allSnapshots(chainConfig)
- d, err := dir.OpenRw(snapshots.Dir())
- if err != nil {
- return err
+ if snapshots != nil {
+ d, err := dir.OpenRw(snapshots.Dir())
+ if err != nil {
+ return err
+ }
+ br = snapshotsync.NewBlockRetire(runtime.NumCPU(), tmpdir, snapshots, d, db, nil, nil)
}
pm, err := prune.Get(tx)
@@ -587,7 +591,7 @@ func stageSenders(db kv.RwDB, ctx context.Context) error {
return err
}
- cfg := stagedsync.StageSendersCfg(db, chainConfig, tmpdir, pm, snapshotsync.NewBlockRetire(runtime.NumCPU(), tmpdir, snapshots, d, db, nil, nil))
+ cfg := stagedsync.StageSendersCfg(db, chainConfig, tmpdir, pm, br)
if unwind > 0 {
u := sync.NewUnwindState(stages.Senders, s.BlockNumber-unwind, s.BlockNumber)
if err = stagedsync.UnwindSendersStage(u, tx, cfg, ctx); err != nil {
--
GitLab