tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

miner: set etherbase even if mining isn't possible at the moment (#21707)

Browse Source
This commit is contained in:
Martin Holst Swende 2020-10-14 11:59:11 +02:00 committed by GitHub
parent bdc7554918
commit 4eb01b21c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miner/miner.go
View File

@ -128,8 +128,8 @@ func (miner *Miner) update() {
events.Unsubscribe()
}
case addr := <-miner.startCh:
if canStart {
miner.SetEtherbase(addr)
if canStart {
miner.worker.start()
}
shouldStart = true

22
miner/miner_test.go
View File

@ -192,6 +192,28 @@ func TestCloseMiner(t *testing.T) {
waitForMiningState(t, miner, false)
}
// 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)
}
}
// waitForMiningState waits until either
// * the desired mining state was reached
// * a timeout was reached which fails the test