Merge pull request #34 from migalabs/feature/limit-array-sizes

Feature/limit array sizes

Author: Miga Labs

src/db/peer.go

@@ -16,6 +16,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+var (
+	MaxArraySize int = 10
+)
+
 // Stores all the information related to a peer
 type Peer struct {
 
@@ -202,13 +206,23 @@ func (pm *Peer) FetchConnectionsFromNewPeer(newPeer Peer) {
 
 		pm.ConnectionEvent(newConnectedDirection, time)
 	}
+
+	if len(pm.ConnectedDirection) > MaxArraySize {
+		tmpConnDirection := pm.ConnectedDirection[len(pm.ConnectedDirection)-MaxArraySize-1 : len(pm.ConnectedDirection)-1]
+		pm.ConnectedDirection = tmpConnDirection
+	}
+
 	for _, time := range newPeer.DisconnectionTimes {
 		pm.DisconnectionEvent(time)
 	}
 
 	for _, errorTmp := range newPeer.Error {
 		pm.Error = append(pm.Error, errorTmp)
 	}
+	if len(pm.Error) > MaxArraySize {
+		tmpError := pm.Error[len(pm.Error)-MaxArraySize-1 : len(pm.Error)-1]
+		pm.Error = tmpError
+	}
 
 	if newPeer.LastErrorTimestamp.After(pm.LastErrorTimestamp) {
 		pm.LastErrorTimestamp = newPeer.LastErrorTimestamp

src/peering/pruning_strategy.go

@@ -614,6 +614,11 @@ func (c *PrunedPeer) NextConnection() time.Time {
 	if c.DelayObj.GetType() == Minus1DelayType { // in case of Minus1, this is new peer and we want it to connect as soon as possible
 		return time.Time{}
 	}
+
+	if c.DelayObj.CalculateDelay() > MaxDelayTime {
+		return c.BaseConnectionTimestamp.Add(MaxDelayTime)
+	}
+
 	// nextConnection should be from first event + the applied delay
 	return c.BaseConnectionTimestamp.Add(c.DelayObj.CalculateDelay())
 }
@@ -657,10 +662,7 @@ func (c *PrunedPeer) UpdateDelay(newDelayType string) {
 		c.BaseDeprecationTimestamp = time.Now()
 	}
 
-	// only add degree in case we have not exceeded the MaxDelay allowed
-	if c.DelayObj.CalculateDelay() < MaxDelayTime {
-		c.DelayObj.AddDegree()
-	}
+	c.DelayObj.AddDegree()
 }
 
 // ErrorToDelayType: