aboutsummaryrefslogtreecommitdiffstats
path: root/eth
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-12 02:22:38 +0800
committerobscuren <geffobscura@gmail.com>2015-02-12 02:22:38 +0800
commit1fc3524e40ced2e780f6b90fa4ca7725c839976f (patch)
tree1d3508d967c9269fd89b0fa2d45313e4c821c170 /eth
parentdf49c609a0fd055a4f0dac89db6863ad5532228f (diff)
parentebc506dae8a15e5dcce4e4369e21d04e3b8f9aa4 (diff)
downloaddexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.gz
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.bz2
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.lz
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.xz
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.tar.zst
dexon-1fc3524e40ced2e780f6b90fa4ca7725c839976f.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'eth')
-rw-r--r--eth/block_pool_test.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/eth/block_pool_test.go b/eth/block_pool_test.go
index 94c3b43d2..331dbe504 100644
--- a/eth/block_pool_test.go
+++ b/eth/block_pool_test.go
@@ -613,6 +613,7 @@ func TestInvalidBlock(t *testing.T) {
}
func TestVerifyPoW(t *testing.T) {
+ t.Skip("***FIX*** This test is broken")
logInit()
_, blockPool, blockPoolTester := newTestBlockPool(t)
blockPoolTester.blockChain[0] = nil