good morning!!!!

Skip to content
Snippets Groups Projects
Unverified Commit cacc4c7e authored by Alex Sharov's avatar Alex Sharov Committed by GitHub
Browse files

fix integration trie nil pointer (#2533)

* fix integration trie

* fix integration trie
parent 5278ef42
No related branches found
No related tags found
No related merge requests found
...@@ -264,7 +264,7 @@ func snapshotCheck(ctx context.Context, db kv.RwDB, isNew bool, tmpDir string) ( ...@@ -264,7 +264,7 @@ func snapshotCheck(ctx context.Context, db kv.RwDB, isNew bool, tmpDir string) (
stage6 := stage(sync, tx, nil, stages.IntermediateHashes) stage6 := stage(sync, tx, nil, stages.IntermediateHashes)
stage6.BlockNumber = blockNumber - 1 stage6.BlockNumber = blockNumber - 1
log.Info("Stage6", "progress", stage6.BlockNumber) log.Info("Stage6", "progress", stage6.BlockNumber)
if _, err = stagedsync.SpawnIntermediateHashesStage(stage5, nil /* Unwinder */, tx, stagedsync.StageTrieCfg(db, true, true, tmpDir), ctx); err != nil { if _, err = stagedsync.SpawnIntermediateHashesStage(stage5, sync /* Unwinder */, tx, stagedsync.StageTrieCfg(db, true, true, tmpDir), ctx); err != nil {
log.Error("Error on ih", "err", err, "block", blockNumber) log.Error("Error on ih", "err", err, "block", blockNumber)
return fmt.Errorf("spawnIntermediateHashesStage %w", err) return fmt.Errorf("spawnIntermediateHashesStage %w", err)
} }
......
...@@ -498,7 +498,10 @@ func stageTrie(db kv.RwDB, ctx context.Context) error { ...@@ -498,7 +498,10 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
defer tx.Rollback() defer tx.Rollback()
if reset { if reset {
return stagedsync.ResetIH(tx) if err := stagedsync.ResetIH(tx); err != nil {
return err
}
return tx.Commit()
} }
execStage := stage(sync, tx, nil, stages.Execution) execStage := stage(sync, tx, nil, stages.Execution)
s := stage(sync, tx, nil, stages.IntermediateHashes) s := stage(sync, tx, nil, stages.IntermediateHashes)
...@@ -529,7 +532,7 @@ func stageTrie(db kv.RwDB, ctx context.Context) error { ...@@ -529,7 +532,7 @@ func stageTrie(db kv.RwDB, ctx context.Context) error {
return err return err
} }
} else { } else {
if _, err := stagedsync.SpawnIntermediateHashesStage(s, nil /* Unwinder */, tx, cfg, ctx); err != nil { if _, err := stagedsync.SpawnIntermediateHashesStage(s, sync /* Unwinder */, tx, cfg, ctx); err != nil {
return err return err
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment