interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20225 from karalabe/forkid-eth-handshake-verification-plus 

cmd/devp2p, core/forkid: make forkid.Filter API uniform
This commit is contained in:
Péter Szilágyi 2019-10-31 10:58:28 +02:00 committed by GitHub
parent 93422e9d15 8927f7724a
commit 12f2a25d5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/devp2p/nodesetcmd.go
View File

@ -155,7 +155,7 @@ func minAgeFilter(args []string) (nodeFilter, error) {
} }
func ethFilter(args []string) (nodeFilter, error) { func ethFilter(args []string) (nodeFilter, error) {
var filter func(forkid.ID) error var filter forkid.Filter
switch args[0] { switch args[0] {
case "mainnet": case "mainnet":
filter = forkid.NewStaticFilter(params.MainnetChainConfig, params.MainnetGenesisHash) filter = forkid.NewStaticFilter(params.MainnetChainConfig, params.MainnetGenesisHash)

4
core/forkid/forkid.go
View File

@ -96,7 +96,7 @@ func NewFilter(chain *core.BlockChain) Filter {
} }
// NewStaticFilter creates a filter at block zero. // NewStaticFilter creates a filter at block zero.
func NewStaticFilter(config *params.ChainConfig, genesis common.Hash) func(id ID) error { func NewStaticFilter(config *params.ChainConfig, genesis common.Hash) Filter {
head := func() uint64 { return 0 } head := func() uint64 { return 0 }
return newFilter(config, genesis, head) return newFilter(config, genesis, head)
} }
@ -104,7 +104,7 @@ func NewStaticFilter(config *params.ChainConfig, genesis common.Hash) func(id ID
// newFilter is the internal version of NewFilter, taking closures as its arguments // newFilter is the internal version of NewFilter, taking closures as its arguments
// instead of a chain. The reason is to allow testing it without having to simulate // instead of a chain. The reason is to allow testing it without having to simulate
// an entire blockchain. // an entire blockchain.
func newFilter(config *params.ChainConfig, genesis common.Hash, headfn func() uint64) func(id ID) error { func newFilter(config *params.ChainConfig, genesis common.Hash, headfn func() uint64) Filter {
// Calculate the all the valid fork hash and fork next combos // Calculate the all the valid fork hash and fork next combos
var ( var (
forks = gatherForks(config) forks = gatherForks(config)