diff --git a/go.mod b/go.mod index 90602dbee..ec54ef334 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/btcsuite/btcd v0.20.1-beta github.com/confio/ics23/go v0.0.0-20200804135932-65ad804e8539 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d - github.com/cosmos/iavl v0.15.0-rc1 + github.com/cosmos/iavl v0.15.0-rc2 github.com/cosmos/ledger-cosmos-go v0.11.1 github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25 github.com/gogo/protobuf v1.3.1 diff --git a/go.sum b/go.sum index 95c4fc39b..0e13eeba8 100644 --- a/go.sum +++ b/go.sum @@ -103,6 +103,8 @@ github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fj github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/iavl v0.15.0-rc1 h1:cYMPAxu5xpGPhGYvGlpeCmgmgH7oY+kebZm2oHfh2nE= github.com/cosmos/iavl v0.15.0-rc1/go.mod h1:qFTkoCC00sBKWCG3Ws8GAUaYR1jIOtwNZ9p8uFOu4Jo= +github.com/cosmos/iavl v0.15.0-rc2 h1:4HI/LYLjWUnou8dehPD+NqEsDc8uamJOU2yHcqdTKv8= +github.com/cosmos/iavl v0.15.0-rc2/go.mod h1:bXLXbwmww0kYtAYRCYNXR/k44lWaK8rIZJlCmqSK8lQ= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index cb3cd44dd..1166adcc6 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -159,19 +159,6 @@ func TestMultistoreCommitLoad(t *testing.T) { require.Nil(t, err) commitID = getExpectedCommitID(store, ver) checkStore(t, store, commitID, commitID) - - // XXX: commit this older version - commitID = store.Commit() - expectedCommitID = getExpectedCommitID(store, ver+1) - checkStore(t, store, expectedCommitID, commitID) - - // XXX: confirm old commit is overwritten and we have rolled back - // LatestVersion - store = newMultiStoreWithMounts(db, types.PruneDefault) - err = store.LoadLatestVersion() - require.Nil(t, err) - commitID = getExpectedCommitID(store, ver+1) - checkStore(t, store, commitID, commitID) } func TestMultistoreLoadWithUpgrade(t *testing.T) { @@ -554,7 +541,6 @@ func newMultiStoreWithModifiedMounts(db dbm.DB, pruningOpts types.PruningOptions func checkStore(t *testing.T, store *Store, expect, got types.CommitID) { require.Equal(t, expect, got) require.Equal(t, expect, store.LastCommitID()) - } func checkContains(t testing.TB, info []types.StoreInfo, wanted []string) {