forked from ethereum/go-ethereum
-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
miner: fix miner stress test (ethereum#18039)
- Loading branch information
1 parent
79c7a69
commit e2640a9
Showing
2 changed files
with
16 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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://%[email protected]:%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("", "") | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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://%[email protected]:%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("", "") | ||
|
||
|