mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-25 21:17:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Integration: fix nil snapshots case (#3723)

Browse Source 
* save

* save
This commit is contained in:
Alex Sharov 2022-03-17 08:57:03 +07:00 committed by GitHub
parent bb711676a4
commit 426d972356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/integration/commands/stages.go
View File

@ -291,7 +291,10 @@ var cmdSetSnapshto = &cobra.Command{
db := openDB(chaindata, logger, true)
defer db.Close()
_, chainConfig := byChain(chain)
snCfg := allSnapshots(chainConfig).Cfg()
var snCfg ethconfig.Snapshot
if allSnapshots(chainConfig) != nil {
snCfg = allSnapshots(chainConfig).Cfg()
}
if err := db.Update(context.Background(), func(tx kv.RwTx) error {
return snapshotsynccli.ForceSetFlags(tx, snCfg)
}); err != nil {
@ -1150,7 +1153,10 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig)
if miningConfig != nil {
cfg.Miner = *miningConfig
}
cfg.Snapshot = allSnapshots(chainConfig).Cfg()
allSn := allSnapshots(chainConfig)
if allSn != nil {
cfg.Snapshot = allSn.Cfg()
}
if cfg.Snapshot.Enabled {
snDir, err := dir.OpenRw(filepath.Join(datadir, "snapshots"))
if err != nil {
@ -1162,7 +1168,7 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig)
sync, err := stages2.NewStagedSync(context.Background(), logger, db, p2p.Config{}, cfg,
chainConfig.TerminalTotalDifficulty, sentryControlServer, tmpdir,
nil, nil, nil, nil, nil,
allSnapshots(chainConfig),
allSn,
)
if err != nil {
panic(err)