Merge "[FAB-3333] Fix the inc_number in gossip msg"

gossip/discovery/discovery_impl.go

@@ -548,7 +548,7 @@ func (d *gossipDiscoveryImpl) resurrectMember(am *proto.SignedGossipMessage, t p
 	d.aliveLastTS[string(pkiID)] = &timestamp{
 		lastSeen: time.Now(),
 		seqNum:   t.SeqNum,
-		incTime:  tsToTime(t.IncNumber),
+		incTime:  tsToTime(t.IncNum),
 	}
 
 	var internalEndpoint string
@@ -722,8 +722,8 @@ func (d *gossipDiscoveryImpl) createAliveMessage(includeInternalEndpoint bool) *
 					PkiId:    pkiID,
 				},
 				Timestamp: &proto.PeerTime{
-					IncNumber: uint64(d.incTime),
-					SeqNum:    seqNum,
+					IncNum: uint64(d.incTime),
+					SeqNum: seqNum,
 				},
 			},
 		},
@@ -782,7 +782,7 @@ func (d *gossipDiscoveryImpl) learnExistingMembers(aliveArr []*proto.SignedGossi
 			d.logger.Debug("Updating aliveness data:", am)
 			// update existing aliveness data
 			alive := d.aliveLastTS[string(am.Membership.PkiId)]
-			alive.incTime = tsToTime(am.Timestamp.IncNumber)
+			alive.incTime = tsToTime(am.Timestamp.IncNum)
 			alive.lastSeen = time.Now()
 			alive.seqNum = am.Timestamp.SeqNum
 
@@ -811,7 +811,7 @@ func (d *gossipDiscoveryImpl) learnNewMembers(aliveMembers []*proto.SignedGossip
 			continue
 		}
 		d.aliveLastTS[string(am.GetAliveMsg().Membership.PkiId)] = &timestamp{
-			incTime:  tsToTime(am.GetAliveMsg().Timestamp.IncNumber),
+			incTime:  tsToTime(am.GetAliveMsg().Timestamp.IncNum),
 			lastSeen: time.Now(),
 			seqNum:   am.GetAliveMsg().Timestamp.SeqNum,
 		}
@@ -825,7 +825,7 @@ func (d *gossipDiscoveryImpl) learnNewMembers(aliveMembers []*proto.SignedGossip
 			continue
 		}
 		d.deadLastTS[string(dm.GetAliveMsg().Membership.PkiId)] = &timestamp{
-			incTime:  tsToTime(dm.GetAliveMsg().Timestamp.IncNumber),
+			incTime:  tsToTime(dm.GetAliveMsg().Timestamp.IncNum),
 			lastSeen: time.Now(),
 			seqNum:   dm.GetAliveMsg().Timestamp.SeqNum,
 		}
@@ -927,12 +927,12 @@ func equalPKIid(a, b common.PKIidType) bool {
 }
 
 func same(a *timestamp, b *proto.PeerTime) bool {
-	return uint64(a.incTime.UnixNano()) == b.IncNumber && a.seqNum == b.SeqNum
+	return uint64(a.incTime.UnixNano()) == b.IncNum && a.seqNum == b.SeqNum
 }
 
 func before(a *timestamp, b *proto.PeerTime) bool {
-	return (uint64(a.incTime.UnixNano()) == b.IncNumber && a.seqNum < b.SeqNum) ||
-		uint64(a.incTime.UnixNano()) < b.IncNumber
+	return (uint64(a.incTime.UnixNano()) == b.IncNum && a.seqNum < b.SeqNum) ||
+		uint64(a.incTime.UnixNano()) < b.IncNum
 }
 
 func getAliveTimeInterval() time.Duration {

gossip/election/adapter.go

@@ -138,8 +138,8 @@ func (ai *adapterImpl) CreateMessage(isDeclaration bool) Msg {
 		PkiId:         ai.selfPKIid,
 		IsDeclaration: isDeclaration,
 		Timestamp: &proto.PeerTime{
-			IncNumber: ai.incTime,
-			SeqNum:    seqNum,
+			IncNum: ai.incTime,
+			SeqNum: seqNum,
 		},
 	}
 

gossip/gossip/channel/channel_test.go

@@ -1406,7 +1406,7 @@ func createStateInfoMsg(ledgerHeight int, pkiID common.PKIidType, channel common
 		Content: &proto.GossipMessage_StateInfo{
 			StateInfo: &proto.StateInfo{
 				Channel_MAC: GenerateMAC(pkiID, channel),
-				Timestamp:   &proto.PeerTime{IncNumber: uint64(time.Now().UnixNano()), SeqNum: 1},
+				Timestamp:   &proto.PeerTime{IncNum: uint64(time.Now().UnixNano()), SeqNum: 1},
 				Metadata:    []byte(fmt.Sprintf("%d", ledgerHeight)),
 				PkiId:       []byte(pkiID),
 			},

gossip/gossip/gossip_impl.go

@@ -1023,8 +1023,8 @@ func (g *gossipServiceImpl) createStateInfoMsg(metadata []byte, chainID common.C
 		Metadata:    metadata,
 		PkiId:       g.comm.GetPKIid(),
 		Timestamp: &proto.PeerTime{
-			IncNumber: uint64(g.incTime.UnixNano()),
-			SeqNum:    uint64(time.Now().UnixNano()),
+			IncNum: uint64(g.incTime.UnixNano()),
+			SeqNum: uint64(time.Now().UnixNano()),
 		},
 	}
 	m := &proto.GossipMessage{

gossip/gossip/gossip_test.go

@@ -1068,8 +1068,8 @@ func createLeadershipMsg(isDeclaration bool, channel common.ChainID, incTime uin
 		IsDeclaration: isDeclaration,
 		PkiId:         pkiid,
 		Timestamp: &proto.PeerTime{
-			IncNumber: incTime,
-			SeqNum:    seqNum,
+			IncNum: incTime,
+			SeqNum: seqNum,
 		},
 	}
 

protos/gossip/extensions.go

@@ -116,14 +116,14 @@ func leaderInvalidationPolicy(thisMsg *LeadershipMessage, thatMsg *LeadershipMes
 }
 
 func compareTimestamps(thisTS *PeerTime, thatTS *PeerTime) common.InvalidationResult {
-	if thisTS.IncNumber == thatTS.IncNumber {
+	if thisTS.IncNum == thatTS.IncNum {
 		if thisTS.SeqNum > thatTS.SeqNum {
 			return common.MessageInvalidates
 		}
 
 		return common.MessageInvalidated
 	}
-	if thisTS.IncNumber < thatTS.IncNumber {
+	if thisTS.IncNum < thatTS.IncNum {
 		return common.MessageInvalidated
 	}
 	return common.MessageInvalidates

protos/gossip/extensions_test.go

@@ -150,8 +150,8 @@ func TestAliveMessageNoActionTaken(t *testing.T) {
 				PkiId:    []byte{17},
 			},
 			Timestamp: &PeerTime{
-				IncNumber: 1,
-				SeqNum:    1,
+				IncNum: 1,
+				SeqNum: 1,
 			},
 			Identity: []byte("peerID1"),
 		},
@@ -165,8 +165,8 @@ func TestAliveMessageNoActionTaken(t *testing.T) {
 				PkiId:    []byte{15},
 			},
 			Timestamp: &PeerTime{
-				IncNumber: 2,
-				SeqNum:    2,
+				IncNum: 2,
+				SeqNum: 2,
 			},
 			Identity: []byte("peerID1"),
 		},
@@ -226,8 +226,8 @@ func TestAliveMessageInvalidation(t *testing.T) {
 				PkiId:    []byte{17},
 			},
 			Timestamp: &PeerTime{
-				IncNumber: 1,
-				SeqNum:    1,
+				IncNum: 1,
+				SeqNum: 1,
 			},
 			Identity: []byte("peerID1"),
 		},
@@ -241,8 +241,8 @@ func TestAliveMessageInvalidation(t *testing.T) {
 				PkiId:    []byte{17},
 			},
 			Timestamp: &PeerTime{
-				IncNumber: 2,
-				SeqNum:    2,
+				IncNum: 2,
+				SeqNum: 2,
 			},
 			Identity: []byte("peerID1"),
 		},
@@ -256,8 +256,8 @@ func TestAliveMessageInvalidation(t *testing.T) {
 				PkiId:    []byte{17},
 			},
 			Timestamp: &PeerTime{
-				IncNumber: 1,
-				SeqNum:    2,
+				IncNum: 1,
+				SeqNum: 2,
 			},
 			Identity: []byte("peerID1"),
 		},
@@ -365,8 +365,8 @@ func TestCheckGossipMessageTypes(t *testing.T) {
 				Endpoint: "localhost",
 			},
 			Timestamp: &PeerTime{
-				SeqNum:    1,
-				IncNumber: 1,
+				SeqNum: 1,
+				IncNum: 1,
 			},
 		},
 	})
@@ -827,20 +827,20 @@ func leadershipMessage(incNum uint64, seqNum uint64, pkid []byte) *GossipMessage
 			PkiId:         pkid,
 			IsDeclaration: false,
 			Timestamp: &PeerTime{
-				IncNumber: incNum,
-				SeqNum:    seqNum,
+				IncNum: incNum,
+				SeqNum: seqNum,
 			},
 		},
 	}
 }
 
-func stateInfoMessage(incNumber uint64, seqNum uint64, pkid []byte, mac []byte) *GossipMessage_StateInfo {
+func stateInfoMessage(incNum uint64, seqNum uint64, pkid []byte, mac []byte) *GossipMessage_StateInfo {
 	return &GossipMessage_StateInfo{
 		StateInfo: &StateInfo{
 			Metadata: []byte{},
 			Timestamp: &PeerTime{
-				IncNumber: incNumber,
-				SeqNum:    seqNum,
+				IncNum: incNum,
+				SeqNum: seqNum,
 			},
 			PkiId:       pkid,
 			Channel_MAC: mac,