aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgary rong <garyrong0905@gmail.com>2018-11-07 16:55:56 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-11-07 16:55:56 +0800
commite2640a96d4311e3ac48de467a6eb3c88b95dfb3e (patch)
treecadf3d6173e51e953e4e09ab0dbada0357e2df5c
parent79c7a69ac8066cc28ceee2ebaab3d0221a8adf57 (diff)
downloadgo-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.gz
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.bz2
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.lz
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.xz
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.tar.zst
go-tangerine-e2640a96d4311e3ac48de467a6eb3c88b95dfb3e.zip
miner: fix miner stress test (#18039)
-rw-r--r--miner/stress_clique.go23
-rw-r--r--miner/stress_ethash.go23
2 files changed, 16 insertions, 30 deletions
diff --git a/miner/stress_clique.go b/miner/stress_clique.go
index 8961091d5..7e19975ae 100644
--- a/miner/stress_clique.go
+++ b/miner/stress_clique.go
@@ -22,7 +22,6 @@ package main
import (
"bytes"
"crypto/ecdsa"
- "fmt"
"io/ioutil"
"math/big"
"math/rand"
@@ -40,7 +39,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 _, sealer := range sealers {
// Start the node and wait until it's up
- node, err := makeSealer(genesis, enodes)
+ node, err := makeSealer(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)
@@ -177,7 +170,7 @@ func makeGenesis(faucets []*ecdsa.PrivateKey, sealers []*ecdsa.PrivateKey) *core
return genesis
}
-func makeSealer(genesis *core.Genesis, nodes []string) (*node.Node, error) {
+func makeSealer(genesis *core.Genesis) (*node.Node, error) {
// Define the basic configurations for the Ethereum node
datadir, _ := ioutil.TempDir("", "")
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("", "")