File tree Expand file tree Collapse file tree 1 file changed +0
-7
lines changed Expand file tree Collapse file tree 1 file changed +0
-7
lines changed Original file line number Diff line number Diff line change @@ -67,11 +67,7 @@ func (suite *StateDBTestSuite) TestAccount() {
6767 suite .Require ().Equal (common .BytesToHash (mocks .EmptyCodeHash ), db .GetCodeHash (address ))
6868 suite .Require ().Equal (uint64 (0 ), db .GetNonce (address ))
6969 }},
70- << << << < HEAD
7170 {"self-destruct" , func (ctx sdk.Context , db * statedb.StateDB ) {
72- == == == =
73- {"suicide" , func (ctx sdk.Context , db * statedb.StateDB ) {
74- >> >> >> > origin / fix / multistore - snapshot
7571 // non-exist account.
7672 db .SelfDestruct (address )
7773 suite .Require ().False (db .HasSelfDestructed (address ))
@@ -107,7 +103,6 @@ func (suite *StateDBTestSuite) TestAccount() {
107103 // and cleared in keeper too
108104 keeper := db .Keeper ().(* mocks.EVMKeeper )
109105 keeper .ForEachStorage (ctx , address , func (key , value common.Hash ) bool {
110- << << << < HEAD
111106 suite .Require ().Equal (0 , len (value .Bytes ()))
112107 return true
113108 })
@@ -192,9 +187,7 @@ func (suite *StateDBTestSuite) TestAccount() {
192187 keeper .ForEachStorage (ctx , address , func (key , value common.Hash ) bool {
193188 suite .Require ().Greater (len (value .Bytes ()), 0 )
194189 return true
195- == == == =
196190 return len (value ) == 0
197- >> >> >> > origin / fix / multistore - snapshot
198191 })
199192 }},
200193 }
You can’t perform that action at this time.
0 commit comments