diff options
author | gary rong <garyrong0905@gmail.com> | 2018-11-07 16:55:56 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-11-07 16:55:56 +0800 |
commit | e2640a96d4311e3ac48de467a6eb3c88b95dfb3e (patch) | |
tree | cadf3d6173e51e953e4e09ab0dbada0357e2df5c /miner/stress_ethash.go | |
parent | 79c7a69ac8066cc28ceee2ebaab3d0221a8adf57 (diff) | |
download | dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.gz dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.bz2 dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.lz dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.xz dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.zst dexon-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.zip |
miner: fix miner stress test (#18039)
Diffstat (limited to 'miner/stress_ethash.go')
-rw-r--r-- | miner/stress_ethash.go | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 5ed11d73a..044ca9a21 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -21,7 +21,6 @@ package main import ( "crypto/ecdsa" - "fmt" "io/ioutil" "math/big" "math/rand" @@ -41,7 +40,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/params" ) @@ -62,11 +61,11 @@ func main() { var ( nodes []*node.Node - enodes []string + enodes []*enode.Node ) for i := 0; i < 4; i++ { // Start the node and wait until it's up - node, err := makeMiner(genesis, enodes) + node, err := makeMiner(genesis) if err != nil { panic(err) } @@ -76,18 +75,12 @@ func main() { time.Sleep(250 * time.Millisecond) } // Connect the node to al the previous ones - for _, enode := range enodes { - enode, err := discover.ParseNode(enode) - if err != nil { - panic(err) - } - node.Server().AddPeer(enode) + for _, n := range enodes { + node.Server().AddPeer(n) } - // Start tracking the node and it's enode url + // Start tracking the node and it's enode nodes = append(nodes, node) - - enode := fmt.Sprintf("enode://%s@127.0.0.1:%d", node.Server().NodeInfo().ID, node.Server().NodeInfo().Ports.Listener) - enodes = append(enodes, enode) + enodes = append(enodes, node.Server().Self()) // Inject the signer key and start sealing with it store := node.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore) @@ -155,7 +148,7 @@ func makeGenesis(faucets []*ecdsa.PrivateKey) *core.Genesis { return genesis } -func makeMiner(genesis *core.Genesis, nodes []string) (*node.Node, error) { +func makeMiner(genesis *core.Genesis) (*node.Node, error) { // Define the basic configurations for the Ethereum node datadir, _ := ioutil.TempDir("", "") |