Skip to content

P
plugin
Commit d9104ea7 authored by linj's avatar linj
Browse files
Options

fix return err

parent 9939b89c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
plugin/dapp/trade/executor/localdb_v1.go
View file @ d9104ea7
...@@ -44,8 +44,7 @@ func UpgradeLocalDBV2(localDB dbm.KVDB) error { ...@@ -44,8 +44,7 @@ func UpgradeLocalDBV2(localDB dbm.KVDB) error {
toVersion := 2 toVersion := 2
version, err := getVersion(localDB) version, err := getVersion(localDB)
if err != nil { if err != nil {
errors.Wrap(err, "UpgradeLocalDBV2 get version") return errors.Wrap(err, "UpgradeLocalDBV2 get version")
return err
} }
if version >= toVersion { if version >= toVersion {
tradelog.Debug("UpgradeLocalDBV2 not need to upgrade", "current_version", version, "to_version", toVersion) tradelog.Debug("UpgradeLocalDBV2 not need to upgrade", "current_version", version, "to_version", toVersion)
...@@ -54,19 +53,16 @@ func UpgradeLocalDBV2(localDB dbm.KVDB) error { ...@@ -54,19 +53,16 @@ func UpgradeLocalDBV2(localDB dbm.KVDB) error {
err = UpgradeLocalDBPart2(localDB) err = UpgradeLocalDBPart2(localDB)
if err != nil { if err != nil {
errors.Wrap(err, "UpgradeLocalDBV2 UpgradeLocalDBPart2") return errors.Wrap(err, "UpgradeLocalDBV2 UpgradeLocalDBPart2")
return err
} }
err = UpgradeLocalDBPart1(localDB) err = UpgradeLocalDBPart1(localDB)
if err != nil { if err != nil {
errors.Wrap(err, "UpgradeLocalDBV2 UpgradeLocalDBPart1") return errors.Wrap(err, "UpgradeLocalDBV2 UpgradeLocalDBPart1")
return err
} }
err = setVersion(localDB, toVersion) err = setVersion(localDB, toVersion)
if err != nil { if err != nil {
errors.Wrap(err, "UpgradeLocalDBV2 setVersion") return errors.Wrap(err, "UpgradeLocalDBV2 setVersion")
return err
} }
return nil return nil
} }
...@@ -88,8 +84,7 @@ func UpgradeLocalDBPart1(localDB dbm.KVDB) error { ...@@ -88,8 +84,7 @@ func UpgradeLocalDBPart1(localDB dbm.KVDB) error {
for _, prefix := range prefixes { for _, prefix := range prefixes {
err := delOnePrefix(localDB, prefix) err := delOnePrefix(localDB, prefix)
if err != nil { if err != nil {
errors.Wrapf(err, "UpdateLocalDBPart1 delOnePrefix: %s", prefix) return errors.Wrapf(err, "UpdateLocalDBPart1 delOnePrefix: %s", prefix)
return err
} }
} }
return nil return nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment