Commit 80b42f67 authored by Andreas Bigger's avatar Andreas Bigger

bad nil pointer deref

parent 15cf4af6
...@@ -16,7 +16,7 @@ type scorer struct { ...@@ -16,7 +16,7 @@ type scorer struct {
metricer GossipMetricer metricer GossipMetricer
log log.Logger log log.Logger
gater PeerGater gater PeerGater
bandScoreThresholds BandScoreThresholds bandScoreThresholds *BandScoreThresholds
} }
// scorePair holds a band and its corresponding threshold. // scorePair holds a band and its corresponding threshold.
...@@ -101,7 +101,7 @@ type Scorer interface { ...@@ -101,7 +101,7 @@ type Scorer interface {
} }
// NewScorer returns a new peer scorer. // NewScorer returns a new peer scorer.
func NewScorer(peerGater PeerGater, peerStore Peerstore, metricer GossipMetricer, bandScoreThresholds BandScoreThresholds, log log.Logger) Scorer { func NewScorer(peerGater PeerGater, peerStore Peerstore, metricer GossipMetricer, bandScoreThresholds *BandScoreThresholds, log log.Logger) Scorer {
return &scorer{ return &scorer{
peerStore: peerStore, peerStore: peerStore,
metricer: metricer, metricer: metricer,
......
...@@ -20,7 +20,7 @@ type PeerScorerTestSuite struct { ...@@ -20,7 +20,7 @@ type PeerScorerTestSuite struct {
mockGater *p2pMocks.PeerGater mockGater *p2pMocks.PeerGater
mockStore *p2pMocks.Peerstore mockStore *p2pMocks.Peerstore
mockMetricer *p2pMocks.GossipMetricer mockMetricer *p2pMocks.GossipMetricer
bandScorer p2p.BandScoreThresholds bandScorer *p2p.BandScoreThresholds
logger log.Logger logger log.Logger
} }
...@@ -31,7 +31,7 @@ func (testSuite *PeerScorerTestSuite) SetupTest() { ...@@ -31,7 +31,7 @@ func (testSuite *PeerScorerTestSuite) SetupTest() {
testSuite.mockMetricer = &p2pMocks.GossipMetricer{} testSuite.mockMetricer = &p2pMocks.GossipMetricer{}
bandScorer, err := p2p.NewBandScorer("0:graylist;") bandScorer, err := p2p.NewBandScorer("0:graylist;")
testSuite.NoError(err) testSuite.NoError(err)
testSuite.bandScorer = *bandScorer testSuite.bandScorer = bandScorer
testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError) testSuite.logger = testlog.Logger(testSuite.T(), log.LvlError)
} }
......
...@@ -14,7 +14,7 @@ func ConfigurePeerScoring(h host.Host, g ConnectionGater, gossipConf GossipSetup ...@@ -14,7 +14,7 @@ func ConfigurePeerScoring(h host.Host, g ConnectionGater, gossipConf GossipSetup
peerScoreThresholds := NewPeerScoreThresholds() peerScoreThresholds := NewPeerScoreThresholds()
banEnabled := gossipConf.BanPeers() banEnabled := gossipConf.BanPeers()
peerGater := NewPeerGater(g, log, banEnabled) peerGater := NewPeerGater(g, log, banEnabled)
scorer := NewScorer(peerGater, h.Peerstore(), m, *gossipConf.PeerBandScorer(), log) scorer := NewScorer(peerGater, h.Peerstore(), m, gossipConf.PeerBandScorer(), log)
opts := []pubsub.Option{} opts := []pubsub.Option{}
// Check the app specific score since libp2p doesn't export it's [validate] function :/ // Check the app specific score since libp2p doesn't export it's [validate] function :/
if peerScoreParams != nil && peerScoreParams.AppSpecificScore != nil { if peerScoreParams != nil && peerScoreParams.AppSpecificScore != nil {
......
...@@ -63,7 +63,6 @@ services: ...@@ -63,7 +63,6 @@ services:
--p2p.listen.udp=9003 --p2p.listen.udp=9003
--p2p.scoring.peers=light --p2p.scoring.peers=light
--p2p.ban.peers=true --p2p.ban.peers=true
--p2p.score.bands="-40:graylist;-20:restricted;0:nopx;20:friend;"
--snapshotlog.file=/op_log/snapshot.log --snapshotlog.file=/op_log/snapshot.log
--p2p.priv.path=/config/p2p-node-key.txt --p2p.priv.path=/config/p2p-node-key.txt
--metrics.enabled --metrics.enabled
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment