From 60de4d6dd1403abd4daa142bb2e43cb917fe7b15 Mon Sep 17 00:00:00 2001
From: Gustav Simonsson <gustav.simonsson@gmail.com>
Date: Fri, 20 Mar 2015 09:13:17 +0100
Subject: [PATCH] gofmt
---
cmd/ethereum/blocktest.go | 2 +-
tests/blocktest.go | 6 ++----
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
}
--
GitLab