Apply recommended changes

ratelimiter/db.go

@@ -32,7 +32,7 @@ type IsolatedDB struct {
 	prefix []byte
 }
 
-func (db IsolatedDB) withPrefix(key []byte) []byte {
+func (db IsolatedDB) keyWithPrefix(key []byte) []byte {
 	fkey := make([]byte, len(db.prefix)+len(key))
 	copy(fkey, db.prefix)
 	copy(fkey[len(db.prefix):], key)
@@ -41,17 +41,17 @@ func (db IsolatedDB) withPrefix(key []byte) []byte {
 
 // Put writes a value at the key location.
 func (db IsolatedDB) Put(key, value []byte, wo *opt.WriteOptions) error {
-	return db.db.Put(db.withPrefix(key), value, wo)
+	return db.db.Put(db.keyWithPrefix(key), value, wo)
 }
 
 // Get gets a value of key.
 func (db IsolatedDB) Get(key []byte, ro *opt.ReadOptions) (value []byte, err error) {
-	return db.db.Get(db.withPrefix(key), ro)
+	return db.db.Get(db.keyWithPrefix(key), ro)
 }
 
 // Delete record at the location of key.
 func (db IsolatedDB) Delete(key []byte, wo *opt.WriteOptions) error {
-	return db.db.Delete(db.withPrefix(key), wo)
+	return db.db.Delete(db.keyWithPrefix(key), wo)
 }
 
 // BlacklistRecord is a record with information of a deadline for a particular ID.

ratelimiter/peer.go

@@ -36,51 +36,51 @@ func selectFunc(mode int) modeFunc {
 	return byID
 }
 
-// NewP2PRateLimiter returns an instance of P2PRateLimiter.
-func NewP2PRateLimiter(mode int, ratelimiter Interface) P2PRateLimiter {
-	return P2PRateLimiter{
+// NewPeerRateLimiter returns an instance of PeerRateLimiter.
+func NewPeerRateLimiter(mode int, ratelimiter Interface) PeerRateLimiter {
+	return PeerRateLimiter{
 		getID:       selectFunc(mode),
 		ratelimiter: ratelimiter,
 	}
 }
 
-// P2PRateLimiter implements rate limiter that accepts p2p.Peer as identifier.
-type P2PRateLimiter struct {
+// PeerRateLimiter implements rate limiter that accepts p2p.Peer as identifier.
+type PeerRateLimiter struct {
 	getID       modeFunc
 	ratelimiter Interface
 }
 
 // Create instantiates rate limiter with for a peer.
-func (r P2PRateLimiter) Create(peer *p2p.Peer, cfg Config) error {
+func (r PeerRateLimiter) Create(peer *p2p.Peer, cfg Config) error {
 	return r.ratelimiter.Create(r.getID(peer), cfg)
 }
 
 // Remove drops peer from in-memory rate limiter. If duration is non-zero peer will be blacklisted.
-func (r P2PRateLimiter) Remove(peer *p2p.Peer, duration time.Duration) error {
+func (r PeerRateLimiter) Remove(peer *p2p.Peer, duration time.Duration) error {
 	return r.ratelimiter.Remove(r.getID(peer), duration)
 }
 
 // TakeAvailable subtracts given amount up to the available limit.
-func (r P2PRateLimiter) TakeAvailable(peer *p2p.Peer, count int64) int64 {
+func (r PeerRateLimiter) TakeAvailable(peer *p2p.Peer, count int64) int64 {
 	return r.ratelimiter.TakeAvailable(r.getID(peer), count)
 }
 
 // Available peeks into the current available limit.
-func (r P2PRateLimiter) Available(peer *p2p.Peer) int64 {
+func (r PeerRateLimiter) Available(peer *p2p.Peer) int64 {
 	return r.ratelimiter.Available(r.getID(peer))
 }
 
 // Whisper is a convenience wrapper for whisper.
 type Whisper struct {
-	Ingress, Egress P2PRateLimiter
+	Ingress, Egress PeerRateLimiter
 	Config          Config
 }
 
 // ForWhisper returns a convenient wrapper to be used in whisper.
 func ForWhisper(mode int, db DBInterface, ingress Config) Whisper {
 	return Whisper{
-		Ingress: NewP2PRateLimiter(mode, NewPersisted(WithPrefix(db, []byte("i")))),
-		Egress:  NewP2PRateLimiter(mode, NewPersisted(WithPrefix(db, []byte("e")))),
+		Ingress: NewPeerRateLimiter(mode, NewPersisted(WithPrefix(db, []byte("i")))),
+		Egress:  NewPeerRateLimiter(mode, NewPersisted(WithPrefix(db, []byte("e")))),
 		Config:  ingress,
 	}
 }

whisperv6/doc.go

@@ -47,7 +47,6 @@ const (
 	messagesCode           = 1   // normal whisper message
 	powRequirementCode     = 2   // PoW requirement
 	bloomFilterExCode      = 3   // bloom filter exchange
-	peerRateLimitCode      = 8   // update of the peer rate limit
 	p2pRequestCompleteCode = 125 // peer-to-peer message, used by Dapp protocol
 	p2pRequestCode         = 126 // peer-to-peer message, used by Dapp protocol
 	p2pMessageCode         = 127 // peer-to-peer message (to be consumed by the peer, but not forwarded any further)

whisperv6/peer.go

@@ -140,6 +140,8 @@ func (peer *Peer) handshake() error {
 		return fmt.Errorf("peer [%x] is useless: two light client communication restricted", peer.ID())
 	}
 
+	// Decode received egress configuration from the peer. In case it's not defined,
+	// sending data to that peer won't be limited.
 	egressCfg := ratelimiter.Config{}
 	if err := s.Decode(&egressCfg); err == nil && peer.host.ratelimiter != nil {
 		peer.host.ratelimiter.Egress.Create(peer.peer, egressCfg)
@@ -229,6 +231,8 @@ func (peer *Peer) broadcast() error {
 			bundle = append(bundle, envelope)
 		}
 	}
+	// bundle will be reduce according to a rate limiter
+	// if rate limiter is nil - this operation is noop
 	bundle = peer.reduceBundle(bundle)
 	if len(bundle) > 0 {
 		// transmit the batch of envelopes

whisperv6/whisper.go

@@ -785,16 +785,6 @@ func (whisper *Whisper) HandlePeer(peer *p2p.Peer, rw p2p.MsgReadWriter) error {
 	return whisper.runMessageLoop(whisperPeer, rw)
 }
 
-func (whisper *Whisper) advertiseEgressLimit(p *Peer, rw p2p.MsgReadWriter) error {
-	if whisper.ratelimiter == nil {
-		return nil
-	}
-	if err := p2p.Send(rw, peerRateLimitCode, whisper.ratelimiter.Config); err != nil {
-		return fmt.Errorf("failed to send ingress rate limit to a peer %v: %v", p.peer.ID(), err)
-	}
-	return nil
-}
-
 // runMessageLoop reads and processes inbound messages directly to merge into client-global state.
 func (whisper *Whisper) runMessageLoop(p *Peer, rw p2p.MsgReadWriter) error {
 	blacklist := false