From 3eb55f5176a71388561317d03deeb38770ff5df7 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 3 Sep 2018 19:13:36 +0200 Subject: [PATCH] tests: s/skipLoad/fails and some more docs --- tests/block_test.go | 2 +- tests/state_test_util.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/block_test.go b/tests/block_test.go index 993f9ca986..c911199299 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -31,7 +31,7 @@ func TestBlockchain(t *testing.T) { bt.skipLoad(`^bcMultiChainTest/(ChainAtoChainB_blockorder|CallContractFromNotBestBlock)`) bt.skipLoad(`^bcTotalDifficultyTest/(lotsOfLeafs|lotsOfBranches|sideChainWithMoreTransactions)`) // This test is broken - bt.skipLoad(`blockhashNonConstArg_Constantinople`) + bt.fails(`blockhashNonConstArg_Constantinople`, "Broken test") // Still failing tests // bt.skipLoad(`^bcWalletTest.*_Byzantium$`) diff --git a/tests/state_test_util.go b/tests/state_test_util.go index d4f644ad53..5d2251e529 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -156,6 +156,8 @@ func (t *StateTest) Run(subtest StateSubtest, vmconfig vm.Config) (*state.StateD statedb.AddBalance(block.Coinbase(), new(big.Int)) // And _now_ get the state root root := statedb.IntermediateRoot(config.IsEIP158(block.Number())) + // N.B: We need to do this in a two-step process, because the first Commit takes care + // of suicides, and we need to touch the coinbase _after_ it has potentially suicided. if root != common.Hash(post.Root) { return statedb, fmt.Errorf("post state root mismatch: got %x, want %x", root, post.Root) }