2020-09-10 20:27:42 +03:00
|
|
|
// Copyright 2020 The go-ethereum Authors
|
|
|
|
// This file is part of the go-ethereum library.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
// Package miner implements Ethereum block creation and mining.
|
|
|
|
package miner
|
|
|
|
|
|
|
|
import (
|
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
2020-10-20 11:58:26 +03:00
|
|
|
"github.com/ethereum/go-ethereum/consensus/clique"
|
2020-09-10 20:27:42 +03:00
|
|
|
"github.com/ethereum/go-ethereum/core"
|
|
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
|
|
|
"github.com/ethereum/go-ethereum/core/state"
|
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
|
|
"github.com/ethereum/go-ethereum/core/vm"
|
|
|
|
"github.com/ethereum/go-ethereum/eth/downloader"
|
|
|
|
"github.com/ethereum/go-ethereum/ethdb/memorydb"
|
|
|
|
"github.com/ethereum/go-ethereum/event"
|
|
|
|
"github.com/ethereum/go-ethereum/trie"
|
|
|
|
)
|
|
|
|
|
|
|
|
type mockBackend struct {
|
|
|
|
bc *core.BlockChain
|
|
|
|
txPool *core.TxPool
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewMockBackend(bc *core.BlockChain, txPool *core.TxPool) *mockBackend {
|
|
|
|
return &mockBackend{
|
|
|
|
bc: bc,
|
|
|
|
txPool: txPool,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *mockBackend) BlockChain() *core.BlockChain {
|
|
|
|
return m.bc
|
|
|
|
}
|
|
|
|
|
|
|
|
func (m *mockBackend) TxPool() *core.TxPool {
|
|
|
|
return m.txPool
|
|
|
|
}
|
|
|
|
|
|
|
|
type testBlockChain struct {
|
|
|
|
statedb *state.StateDB
|
|
|
|
gasLimit uint64
|
|
|
|
chainHeadFeed *event.Feed
|
|
|
|
}
|
|
|
|
|
|
|
|
func (bc *testBlockChain) CurrentBlock() *types.Block {
|
|
|
|
return types.NewBlock(&types.Header{
|
|
|
|
GasLimit: bc.gasLimit,
|
|
|
|
}, nil, nil, nil, new(trie.Trie))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (bc *testBlockChain) GetBlock(hash common.Hash, number uint64) *types.Block {
|
|
|
|
return bc.CurrentBlock()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (bc *testBlockChain) StateAt(common.Hash) (*state.StateDB, error) {
|
|
|
|
return bc.statedb, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (bc *testBlockChain) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event.Subscription {
|
|
|
|
return bc.chainHeadFeed.Subscribe(ch)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMiner(t *testing.T) {
|
|
|
|
miner, mux := createMiner(t)
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Start the downloader
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
// Stop the downloader and wait for the update loop to run
|
|
|
|
mux.Post(downloader.DoneEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
miner: don't interrupt mining after successful sync (#21701)
* miner: exit loop when downloader Done or Failed
Following the logic of the comment at the method,
this fixes a regression introduced at 7cf56d6f064869cb62b1673f9ee437020c595391
, which would allow external parties to DoS with
blocks, preventing mining progress.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove ineff assign (lint)
Signed-off-by: meows <b5c6@protonmail.com>
* miner: update test re downloader events
Signed-off-by: meows <b5c6@protonmail.com>
* Revert "miner: remove ineff assign (lint)"
This reverts commit eaefcd34ab4862ebc936fb8a07578aa2744bc058.
* Revert "miner: exit loop when downloader Done or Failed"
This reverts commit 23abd34265aa246c38fc390bb72572ad6ae9fe3b.
* miner: add test showing imprecise TestMiner
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix waitForMiningState precision
This helper function would return an affirmation
on the first positive match on a desired bool.
This was imprecise; it return false positives
by not waiting initially for an 'updated' value.
This fix causes TestMiner_2 to fail, which is
expected.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove TestMiner_2 demonstrating broken test
This test demonstrated the imprecision of the test
helper function waitForMiningState. This function
has been fixed with 6d365c2851, and this test test
may now be removed.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix test regarding downloader event/mining expectations
See comment for logic.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: add test describing expectations for downloader/mining events
We expect that once the downloader emits a DoneEvent,
signaling a successful sync, that subsequent StartEvents
are not longer permitted to stop the miner.
This prevents a security vulnerability where forced syncs via
fake high blocks would stall mining operation.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: use 'canStop' state to fix downloader event handling
- Break downloader event handling into event
separating Done and Failed events. We need to
treat these cases differently since a DoneEvent
should prevent the miner from being stopped on
subsequent downloader Start events.
- Use canStop state to handle the one-off
case when a downloader first succeeds.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: improve comment wording
Signed-off-by: meows <b5c6@protonmail.com>
* miner: start mining on downloader events iff not already mining
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor miner update logic w/r/t downloader events
This makes mining pause/start logic regarding downloader
events more explicit. Instead of eternally handling downloader
events after the first done event, the subscription is closed
when downloader events are no longer actionable.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix handling downloader events on subcription closed
Signed-off-by: meows <b5c6@protonmail.com>
* miner: (lint:gosimple) use range over chan instead of for/select
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor update loop to remove race condition
The go routine handling the downloader events handling
vars in parallel with the parent routine, causing a
race condition.
This change, though ugly, remove the condition while
still allowing the downloader event subscription to be
closed when the miner has no further use for it (ie DoneEvent).
* miner: alternate fix for miner-flaw
Co-authored-by: meows <b5c6@protonmail.com>
2020-10-13 15:12:06 +03:00
|
|
|
|
|
|
|
// Subsequent downloader events after a successful DoneEvent should not cause the
|
|
|
|
// miner to start or stop. This prevents a security vulnerability
|
|
|
|
// that would allow entities to present fake high blocks that would
|
|
|
|
// stop mining operations by causing a downloader sync
|
|
|
|
// until it was discovered they were invalid, whereon mining would resume.
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
|
|
|
|
mux.Post(downloader.FailedEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestMinerDownloaderFirstFails tests that mining is only
|
|
|
|
// permitted to run indefinitely once the downloader sees a DoneEvent (success).
|
|
|
|
// An initial FailedEvent should allow mining to stop on a subsequent
|
|
|
|
// downloader StartEvent.
|
|
|
|
func TestMinerDownloaderFirstFails(t *testing.T) {
|
|
|
|
miner, mux := createMiner(t)
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Start the downloader
|
2020-09-10 20:27:42 +03:00
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
miner: don't interrupt mining after successful sync (#21701)
* miner: exit loop when downloader Done or Failed
Following the logic of the comment at the method,
this fixes a regression introduced at 7cf56d6f064869cb62b1673f9ee437020c595391
, which would allow external parties to DoS with
blocks, preventing mining progress.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove ineff assign (lint)
Signed-off-by: meows <b5c6@protonmail.com>
* miner: update test re downloader events
Signed-off-by: meows <b5c6@protonmail.com>
* Revert "miner: remove ineff assign (lint)"
This reverts commit eaefcd34ab4862ebc936fb8a07578aa2744bc058.
* Revert "miner: exit loop when downloader Done or Failed"
This reverts commit 23abd34265aa246c38fc390bb72572ad6ae9fe3b.
* miner: add test showing imprecise TestMiner
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix waitForMiningState precision
This helper function would return an affirmation
on the first positive match on a desired bool.
This was imprecise; it return false positives
by not waiting initially for an 'updated' value.
This fix causes TestMiner_2 to fail, which is
expected.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove TestMiner_2 demonstrating broken test
This test demonstrated the imprecision of the test
helper function waitForMiningState. This function
has been fixed with 6d365c2851, and this test test
may now be removed.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix test regarding downloader event/mining expectations
See comment for logic.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: add test describing expectations for downloader/mining events
We expect that once the downloader emits a DoneEvent,
signaling a successful sync, that subsequent StartEvents
are not longer permitted to stop the miner.
This prevents a security vulnerability where forced syncs via
fake high blocks would stall mining operation.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: use 'canStop' state to fix downloader event handling
- Break downloader event handling into event
separating Done and Failed events. We need to
treat these cases differently since a DoneEvent
should prevent the miner from being stopped on
subsequent downloader Start events.
- Use canStop state to handle the one-off
case when a downloader first succeeds.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: improve comment wording
Signed-off-by: meows <b5c6@protonmail.com>
* miner: start mining on downloader events iff not already mining
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor miner update logic w/r/t downloader events
This makes mining pause/start logic regarding downloader
events more explicit. Instead of eternally handling downloader
events after the first done event, the subscription is closed
when downloader events are no longer actionable.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix handling downloader events on subcription closed
Signed-off-by: meows <b5c6@protonmail.com>
* miner: (lint:gosimple) use range over chan instead of for/select
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor update loop to remove race condition
The go routine handling the downloader events handling
vars in parallel with the parent routine, causing a
race condition.
This change, though ugly, remove the condition while
still allowing the downloader event subscription to be
closed when the miner has no further use for it (ie DoneEvent).
* miner: alternate fix for miner-flaw
Co-authored-by: meows <b5c6@protonmail.com>
2020-10-13 15:12:06 +03:00
|
|
|
|
2020-09-10 20:27:42 +03:00
|
|
|
// Stop the downloader and wait for the update loop to run
|
|
|
|
mux.Post(downloader.FailedEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
miner: don't interrupt mining after successful sync (#21701)
* miner: exit loop when downloader Done or Failed
Following the logic of the comment at the method,
this fixes a regression introduced at 7cf56d6f064869cb62b1673f9ee437020c595391
, which would allow external parties to DoS with
blocks, preventing mining progress.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove ineff assign (lint)
Signed-off-by: meows <b5c6@protonmail.com>
* miner: update test re downloader events
Signed-off-by: meows <b5c6@protonmail.com>
* Revert "miner: remove ineff assign (lint)"
This reverts commit eaefcd34ab4862ebc936fb8a07578aa2744bc058.
* Revert "miner: exit loop when downloader Done or Failed"
This reverts commit 23abd34265aa246c38fc390bb72572ad6ae9fe3b.
* miner: add test showing imprecise TestMiner
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix waitForMiningState precision
This helper function would return an affirmation
on the first positive match on a desired bool.
This was imprecise; it return false positives
by not waiting initially for an 'updated' value.
This fix causes TestMiner_2 to fail, which is
expected.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove TestMiner_2 demonstrating broken test
This test demonstrated the imprecision of the test
helper function waitForMiningState. This function
has been fixed with 6d365c2851, and this test test
may now be removed.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix test regarding downloader event/mining expectations
See comment for logic.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: add test describing expectations for downloader/mining events
We expect that once the downloader emits a DoneEvent,
signaling a successful sync, that subsequent StartEvents
are not longer permitted to stop the miner.
This prevents a security vulnerability where forced syncs via
fake high blocks would stall mining operation.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: use 'canStop' state to fix downloader event handling
- Break downloader event handling into event
separating Done and Failed events. We need to
treat these cases differently since a DoneEvent
should prevent the miner from being stopped on
subsequent downloader Start events.
- Use canStop state to handle the one-off
case when a downloader first succeeds.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: improve comment wording
Signed-off-by: meows <b5c6@protonmail.com>
* miner: start mining on downloader events iff not already mining
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor miner update logic w/r/t downloader events
This makes mining pause/start logic regarding downloader
events more explicit. Instead of eternally handling downloader
events after the first done event, the subscription is closed
when downloader events are no longer actionable.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix handling downloader events on subcription closed
Signed-off-by: meows <b5c6@protonmail.com>
* miner: (lint:gosimple) use range over chan instead of for/select
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor update loop to remove race condition
The go routine handling the downloader events handling
vars in parallel with the parent routine, causing a
race condition.
This change, though ugly, remove the condition while
still allowing the downloader event subscription to be
closed when the miner has no further use for it (ie DoneEvent).
* miner: alternate fix for miner-flaw
Co-authored-by: meows <b5c6@protonmail.com>
2020-10-13 15:12:06 +03:00
|
|
|
|
|
|
|
// Since the downloader hasn't yet emitted a successful DoneEvent,
|
|
|
|
// we expect the miner to stop on next StartEvent.
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
|
|
|
|
// Downloader finally succeeds.
|
|
|
|
mux.Post(downloader.DoneEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
|
|
|
|
// Downloader starts again.
|
|
|
|
// Since it has achieved a DoneEvent once, we expect miner
|
|
|
|
// state to be unchanged.
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
|
|
|
|
mux.Post(downloader.FailedEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMinerStartStopAfterDownloaderEvents(t *testing.T) {
|
|
|
|
miner, mux := createMiner(t)
|
|
|
|
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Start the downloader
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
|
|
|
|
// Downloader finally succeeds.
|
|
|
|
mux.Post(downloader.DoneEvent{})
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
|
|
|
|
miner.Stop()
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
|
|
|
|
miner.Start(common.HexToAddress("0x678910"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
|
|
|
|
miner.Stop()
|
|
|
|
waitForMiningState(t, miner, false)
|
2020-09-10 20:27:42 +03:00
|
|
|
}
|
|
|
|
|
2020-09-11 19:17:09 +03:00
|
|
|
func TestStartWhileDownload(t *testing.T) {
|
|
|
|
miner, mux := createMiner(t)
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Stop the downloader and wait for the update loop to run
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
// Starting the miner after the downloader should not work
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
}
|
|
|
|
|
2020-09-10 20:27:42 +03:00
|
|
|
func TestStartStopMiner(t *testing.T) {
|
|
|
|
miner, _ := createMiner(t)
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
miner.Stop()
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestCloseMiner(t *testing.T) {
|
|
|
|
miner, _ := createMiner(t)
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
miner.Start(common.HexToAddress("0x12345"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Terminate the miner and wait for the update loop to run
|
|
|
|
miner.Close()
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
}
|
|
|
|
|
2020-10-14 12:59:11 +03:00
|
|
|
// TestMinerSetEtherbase checks that etherbase becomes set even if mining isn't
|
|
|
|
// possible at the moment
|
|
|
|
func TestMinerSetEtherbase(t *testing.T) {
|
|
|
|
miner, mux := createMiner(t)
|
|
|
|
// Start with a 'bad' mining address
|
|
|
|
miner.Start(common.HexToAddress("0xdead"))
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// Start the downloader
|
|
|
|
mux.Post(downloader.StartEvent{})
|
|
|
|
waitForMiningState(t, miner, false)
|
|
|
|
// Now user tries to configure proper mining address
|
|
|
|
miner.Start(common.HexToAddress("0x1337"))
|
|
|
|
// Stop the downloader and wait for the update loop to run
|
|
|
|
mux.Post(downloader.DoneEvent{})
|
|
|
|
|
|
|
|
waitForMiningState(t, miner, true)
|
|
|
|
// The miner should now be using the good address
|
|
|
|
if got, exp := miner.coinbase, common.HexToAddress("0x1337"); got != exp {
|
|
|
|
t.Fatalf("Wrong coinbase, got %x expected %x", got, exp)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-10 20:27:42 +03:00
|
|
|
// waitForMiningState waits until either
|
|
|
|
// * the desired mining state was reached
|
|
|
|
// * a timeout was reached which fails the test
|
|
|
|
func waitForMiningState(t *testing.T, m *Miner, mining bool) {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
var state bool
|
|
|
|
for i := 0; i < 100; i++ {
|
miner: don't interrupt mining after successful sync (#21701)
* miner: exit loop when downloader Done or Failed
Following the logic of the comment at the method,
this fixes a regression introduced at 7cf56d6f064869cb62b1673f9ee437020c595391
, which would allow external parties to DoS with
blocks, preventing mining progress.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove ineff assign (lint)
Signed-off-by: meows <b5c6@protonmail.com>
* miner: update test re downloader events
Signed-off-by: meows <b5c6@protonmail.com>
* Revert "miner: remove ineff assign (lint)"
This reverts commit eaefcd34ab4862ebc936fb8a07578aa2744bc058.
* Revert "miner: exit loop when downloader Done or Failed"
This reverts commit 23abd34265aa246c38fc390bb72572ad6ae9fe3b.
* miner: add test showing imprecise TestMiner
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix waitForMiningState precision
This helper function would return an affirmation
on the first positive match on a desired bool.
This was imprecise; it return false positives
by not waiting initially for an 'updated' value.
This fix causes TestMiner_2 to fail, which is
expected.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: remove TestMiner_2 demonstrating broken test
This test demonstrated the imprecision of the test
helper function waitForMiningState. This function
has been fixed with 6d365c2851, and this test test
may now be removed.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix test regarding downloader event/mining expectations
See comment for logic.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: add test describing expectations for downloader/mining events
We expect that once the downloader emits a DoneEvent,
signaling a successful sync, that subsequent StartEvents
are not longer permitted to stop the miner.
This prevents a security vulnerability where forced syncs via
fake high blocks would stall mining operation.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: use 'canStop' state to fix downloader event handling
- Break downloader event handling into event
separating Done and Failed events. We need to
treat these cases differently since a DoneEvent
should prevent the miner from being stopped on
subsequent downloader Start events.
- Use canStop state to handle the one-off
case when a downloader first succeeds.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: improve comment wording
Signed-off-by: meows <b5c6@protonmail.com>
* miner: start mining on downloader events iff not already mining
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor miner update logic w/r/t downloader events
This makes mining pause/start logic regarding downloader
events more explicit. Instead of eternally handling downloader
events after the first done event, the subscription is closed
when downloader events are no longer actionable.
Signed-off-by: meows <b5c6@protonmail.com>
* miner: fix handling downloader events on subcription closed
Signed-off-by: meows <b5c6@protonmail.com>
* miner: (lint:gosimple) use range over chan instead of for/select
Signed-off-by: meows <b5c6@protonmail.com>
* miner: refactor update loop to remove race condition
The go routine handling the downloader events handling
vars in parallel with the parent routine, causing a
race condition.
This change, though ugly, remove the condition while
still allowing the downloader event subscription to be
closed when the miner has no further use for it (ie DoneEvent).
* miner: alternate fix for miner-flaw
Co-authored-by: meows <b5c6@protonmail.com>
2020-10-13 15:12:06 +03:00
|
|
|
time.Sleep(10 * time.Millisecond)
|
2020-09-10 20:27:42 +03:00
|
|
|
if state = m.Mining(); state == mining {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
t.Fatalf("Mining() == %t, want %t", state, mining)
|
|
|
|
}
|
|
|
|
|
|
|
|
func createMiner(t *testing.T) (*Miner, *event.TypeMux) {
|
|
|
|
// Create Ethash config
|
|
|
|
config := Config{
|
|
|
|
Etherbase: common.HexToAddress("123456789"),
|
|
|
|
}
|
|
|
|
// Create chainConfig
|
|
|
|
memdb := memorydb.New()
|
|
|
|
chainDB := rawdb.NewDatabase(memdb)
|
|
|
|
genesis := core.DeveloperGenesisBlock(15, common.HexToAddress("12345"))
|
|
|
|
chainConfig, _, err := core.SetupGenesisBlock(chainDB, genesis)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("can't create new chain config: %v", err)
|
|
|
|
}
|
|
|
|
// Create consensus engine
|
2020-10-20 11:58:26 +03:00
|
|
|
engine := clique.New(chainConfig.Clique, chainDB)
|
2020-09-10 20:27:42 +03:00
|
|
|
// Create Ethereum backend
|
2020-10-20 11:58:26 +03:00
|
|
|
bc, err := core.NewBlockChain(chainDB, nil, chainConfig, engine, vm.Config{}, nil, nil)
|
2020-09-10 20:27:42 +03:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("can't create new chain %v", err)
|
|
|
|
}
|
2020-10-20 11:58:26 +03:00
|
|
|
statedb, _ := state.New(common.Hash{}, state.NewDatabase(chainDB), nil)
|
2020-09-10 20:27:42 +03:00
|
|
|
blockchain := &testBlockChain{statedb, 10000000, new(event.Feed)}
|
|
|
|
|
2020-10-20 11:58:26 +03:00
|
|
|
pool := core.NewTxPool(testTxPoolConfig, chainConfig, blockchain)
|
2020-09-10 20:27:42 +03:00
|
|
|
backend := NewMockBackend(bc, pool)
|
2020-10-20 11:58:26 +03:00
|
|
|
// Create event Mux
|
|
|
|
mux := new(event.TypeMux)
|
2020-09-10 20:27:42 +03:00
|
|
|
// Create Miner
|
2020-10-20 11:58:26 +03:00
|
|
|
return New(backend, &config, chainConfig, mux, engine, nil), mux
|
2020-09-10 20:27:42 +03:00
|
|
|
}
|