aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Simonsson <gustav.simonsson@gmail.com>2015-03-20 16:13:17 +0800
committerGustav Simonsson <gustav.simonsson@gmail.com>2015-03-23 23:32:20 +0800
commit60de4d6dd1403abd4daa142bb2e43cb917fe7b15 (patch)
tree33fbb1fab7dd440feb2057ee440788eb19aa6a55
parent08bb472c913a2b4cf0838785616b1ec7712d0b00 (diff)
downloaddexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar.gz
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar.bz2
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar.lz
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar.xz
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.tar.zst
dexon-60de4d6dd1403abd4daa142bb2e43cb917fe7b15.zip
gofmt
-rw-r--r--cmd/ethereum/blocktest.go2
-rw-r--r--tests/blocktest.go6
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd/ethereum/blocktest.go b/cmd/ethereum/blocktest.go
index b75518138..d9cdfa83f 100644
--- a/cmd/ethereum/blocktest.go
+++ b/cmd/ethereum/blocktest.go
@@ -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"
)
diff --git a/tests/blocktest.go b/tests/blocktest.go
index 1c26bd649..2ce27cc38 100644
--- a/tests/blocktest.go
+++ b/tests/blocktest.go
@@ -134,9 +134,9 @@ func (t *BlockTest) ValidatePostState(statedb *state.StateDB) error {
nonce, _ := strconv.ParseUint(acct.Nonce, 16, 64)
// address is indirectly verified by the other fields, as it's the db key
- code2 := statedb.GetCode(addr)
+ code2 := statedb.GetCode(addr)
balance2 := statedb.GetBalance(addr)
- nonce2 := statedb.GetNonce(addr)
+ nonce2 := statedb.GetNonce(addr)
if !bytes.Equal(code2, code) {
return fmt.Errorf("account code mismatch, addr, found, expected: ", addrString, hex.EncodeToString(code2), hex.EncodeToString(code))
}
@@ -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
}