Skip to content

Commit 8199ab5

Browse files
chore: simplify base router config
1 parent 7e600c6 commit 8199ab5

1 file changed

Lines changed: 5 additions & 16 deletions

File tree

p2p/config/config.go

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/libp2p/go-libp2p/core/protocol"
88
"go.uber.org/multierr"
99

10-
"github.com/pokt-network/pocket/p2p/providers"
1110
typesP2P "github.com/pokt-network/pocket/p2p/types"
1211
"github.com/pokt-network/pocket/shared/crypto"
1312
"github.com/pokt-network/pocket/shared/modules"
@@ -20,18 +19,16 @@ var (
2019
_ typesP2P.RouterConfig = &RainTreeConfig{}
2120
)
2221

23-
// baseConfig implements `RouterConfig` using the given libp2p host and current
24-
// height and peerstore providers. Intended for internal use by other `RouterConfig`
22+
// baseConfig implements `RouterConfig` using the given libp2p host, pokt address
23+
// and handler function. Intended for internal use by other `RouterConfig`
2524
// implementations with common config parameters.
2625
//
2726
// NB: intentionally *not* embedding `baseConfig` to improve readability of usages
2827
// of would-be embedders (e.g. `BackgroundConfig`).
2928
type baseConfig struct {
30-
Host host.Host
31-
Addr crypto.Address
32-
CurrentHeightProvider providers.CurrentHeightProvider
33-
PeerstoreProvider providers.PeerstoreProvider
34-
Handler func(data []byte) error
29+
Host host.Host
30+
Addr crypto.Address
31+
Handler func(data []byte) error
3532
}
3633

3734
type UnicastRouterConfig struct {
@@ -62,18 +59,10 @@ func (cfg *baseConfig) IsValid() (err error) {
6259
err = multierr.Append(err, fmt.Errorf("pokt address not configured"))
6360
}
6461

65-
if cfg.CurrentHeightProvider == nil {
66-
err = multierr.Append(err, fmt.Errorf("current height provider not configured"))
67-
}
68-
6962
if cfg.Host == nil {
7063
err = multierr.Append(err, fmt.Errorf("host not configured"))
7164
}
7265

73-
if cfg.PeerstoreProvider == nil {
74-
err = multierr.Append(err, fmt.Errorf("peerstore provider not configured"))
75-
}
76-
7766
if cfg.Handler == nil {
7867
err = multierr.Append(err, fmt.Errorf("handler not configured"))
7968
}

0 commit comments

Comments
 (0)