From 8927f7724aa1e096b458ca2c0b1a91d11fdfcc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 31 Oct 2019 10:38:14 +0200
Subject: [PATCH] cmd/devp2p, core/forkid: make forkid.Filter API uniform
---
cmd/devp2p/nodesetcmd.go | 2 +-
core/forkid/forkid.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go
index 384a12da7..de8e6d45e 100644
--- a/cmd/devp2p/nodesetcmd.go
+++ b/cmd/devp2p/nodesetcmd.go
@@ -155,7 +155,7 @@ func minAgeFilter(args []string) (nodeFilter, error) {
}
func ethFilter(args []string) (nodeFilter, error) {
- var filter func(forkid.ID) error
+ var filter forkid.Filter
switch args[0] {
case "mainnet":
filter = forkid.NewStaticFilter(params.MainnetChainConfig, params.MainnetGenesisHash)
diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go
index 706563beb..1e2d7a744 100644
--- a/core/forkid/forkid.go
+++ b/core/forkid/forkid.go
@@ -96,7 +96,7 @@ func NewFilter(chain *core.BlockChain) Filter {
}
// 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 }
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
// instead of a chain. The reason is to allow testing it without having to simulate
// 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
var (
forks = gatherForks(config)
--
GitLab