diff --git a/miner/worker_test.go b/miner/worker_test.go index 2cbf66214a..42a2bdbbf2 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -306,13 +306,11 @@ func TestGenerateBlocksAndImportVerkle(t *testing.T) { w.start() for i := 0; i < 5; i++ { - /* // TODO this causes a failure, but shouldn't. investigate. - b.txPool.AddLocal(b.newRandomTx(true)) + //b.txPool.AddLocal(b.newRandomTx(true)) b.txPool.AddLocal(b.newRandomTx(false)) - w.postSideBlock(core.ChainSideEvent{Block: b.newRandomUncle()}) - w.postSideBlock(core.ChainSideEvent{Block: b.newRandomUncle()}) - */ + //w.postSideBlock(core.ChainSideEvent{Block: b.newRandomUncle()}) + //w.postSideBlock(core.ChainSideEvent{Block: b.newRandomUncle()}) select { case ev := <-sub.Chan(): @@ -320,13 +318,9 @@ func TestGenerateBlocksAndImportVerkle(t *testing.T) { if block.Header().VerkleProof == nil { t.Fatalf("expected Verkle proof in mined block header") } - /* - // TODO this produces invalid merkle roots when attempting to insert. - // investigate. if _, err := chain.InsertChain([]*types.Block{block}); err != nil { t.Fatalf("failed to insert new mined block %d: %v", block.NumberU64(), err) } - */ case <-time.After(3 * time.Second): // Worker needs 1s to include new changes. t.Fatalf("timeout") }