dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

core: unify the format of error messages for (*Blockchain).init()

Browse source
This commit is contained in:
Anna Shaleva 2022-02-25 12:54:14 +03:00 • committed by AnnaShaleva
parent 21515e1835
commit ad0c53c067
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/core/blockchain.go
View file

@ -332,22 +332,22 @@ func (bc *Blockchain) init() error {
return bc.storeBlock(genesisBlock, nil) return bc.storeBlock(genesisBlock, nil)
} }
if ver.Value != version { if ver.Value != version {
return fmt.Errorf("storage version mismatch betweeen %s and %s", version, ver.Value) return fmt.Errorf("storage version mismatch (expected=%s, actual=%s)", version, ver.Value)
} }
if ver.StateRootInHeader != bc.config.StateRootInHeader { if ver.StateRootInHeader != bc.config.StateRootInHeader {
return fmt.Errorf("StateRootInHeader setting mismatch (config=%t, db=%t)", return fmt.Errorf("StateRootInHeader setting mismatch (config=%t, db=%t)",
ver.StateRootInHeader, bc.config.StateRootInHeader) ver.StateRootInHeader, bc.config.StateRootInHeader)
} }
if ver.P2PSigExtensions != bc.config.P2PSigExtensions { if ver.P2PSigExtensions != bc.config.P2PSigExtensions {
return fmt.Errorf("P2PSigExtensions setting mismatch (old=%t, new=%t", return fmt.Errorf("P2PSigExtensions setting mismatch (old=%t, new=%t)",
ver.P2PSigExtensions, bc.config.P2PSigExtensions) ver.P2PSigExtensions, bc.config.P2PSigExtensions)
} }
if ver.P2PStateExchangeExtensions != bc.config.P2PStateExchangeExtensions { if ver.P2PStateExchangeExtensions != bc.config.P2PStateExchangeExtensions {
return fmt.Errorf("P2PStateExchangeExtensions setting mismatch (old=%t, new=%t", return fmt.Errorf("P2PStateExchangeExtensions setting mismatch (old=%t, new=%t)",
ver.P2PStateExchangeExtensions, bc.config.P2PStateExchangeExtensions) ver.P2PStateExchangeExtensions, bc.config.P2PStateExchangeExtensions)
} }
if ver.KeepOnlyLatestState != bc.config.KeepOnlyLatestState { if ver.KeepOnlyLatestState != bc.config.KeepOnlyLatestState {
return fmt.Errorf("KeepOnlyLatestState setting mismatch: old=%v, new=%v", return fmt.Errorf("KeepOnlyLatestState setting mismatch (old=%v, new=%v)",
ver.KeepOnlyLatestState, bc.config.KeepOnlyLatestState) ver.KeepOnlyLatestState, bc.config.KeepOnlyLatestState)
} }
bc.dao.Version = ver bc.dao.Version = ver