This commit is contained in:
Gustav Simonsson 2015-03-20 09:13:17 +01:00
parent 08bb472c91
commit 60de4d6dd1
2 changed files with 3 additions and 5 deletions

View File

@ -5,9 +5,9 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/tests"
)

View File

@ -146,8 +146,6 @@ func (t *BlockTest) ValidatePostState(statedb *state.StateDB) error {
if nonce2 != nonce {
return fmt.Errorf("account nonce mismatch, addr, found, expected: ", addrString, nonce2, nonce)
}
>>>>>>> Add validation of post state accounts to block tests
}
return nil
}