From f41f4ff286380bc8da1550f225169d4da510a5f7 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Sat, 22 Apr 2017 11:37:17 +0800 Subject: [PATCH] [FAB-3333] Fix the inc_number in gossip msg * Fix the field from inc_number to inc_num, which is aligned to the other field like seq_num in the same messsage structure. * Update the generated proto files. * Update the extensions.go to use the new field. Change-Id: Ic449e59c893f31ae3f193b2d6f302b2f96a36825 Signed-off-by: Baohua Yang --- gossip/discovery/discovery_impl.go | 18 +-- gossip/election/adapter.go | 4 +- gossip/gossip/channel/channel_test.go | 2 +- gossip/gossip/gossip_impl.go | 4 +- gossip/gossip/gossip_test.go | 4 +- protos/gossip/extensions.go | 4 +- protos/gossip/extensions_test.go | 34 ++--- protos/gossip/message.pb.go | 174 +++++++++++++------------- protos/gossip/message.proto | 4 +- 9 files changed, 124 insertions(+), 124 deletions(-) diff --git a/gossip/discovery/discovery_impl.go b/gossip/discovery/discovery_impl.go index 723efafd05d..4ac50d5c180 100644 --- a/gossip/discovery/discovery_impl.go +++ b/gossip/discovery/discovery_impl.go @@ -548,7 +548,7 @@ func (d *gossipDiscoveryImpl) resurrectMember(am *proto.SignedGossipMessage, t p d.aliveLastTS[string(pkiID)] = ×tamp{ 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)] = ×tamp{ - 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)] = ×tamp{ - 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 { diff --git a/gossip/election/adapter.go b/gossip/election/adapter.go index d168ca15892..2543ba55877 100644 --- a/gossip/election/adapter.go +++ b/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, }, } diff --git a/gossip/gossip/channel/channel_test.go b/gossip/gossip/channel/channel_test.go index 670aeb876c0..96608e34a64 100644 --- a/gossip/gossip/channel/channel_test.go +++ b/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), }, diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go index ff73d3457e4..6a950f5f939 100644 --- a/gossip/gossip/gossip_impl.go +++ b/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{ diff --git a/gossip/gossip/gossip_test.go b/gossip/gossip/gossip_test.go index 212c6e685a7..501e16727d7 100644 --- a/gossip/gossip/gossip_test.go +++ b/gossip/gossip/gossip_test.go @@ -1066,8 +1066,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, }, } diff --git a/protos/gossip/extensions.go b/protos/gossip/extensions.go index acdc3ac4cef..e8574fa79c0 100644 --- a/protos/gossip/extensions.go +++ b/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 diff --git a/protos/gossip/extensions_test.go b/protos/gossip/extensions_test.go index cd1a8ee2260..c2310caad8c 100644 --- a/protos/gossip/extensions_test.go +++ b/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, diff --git a/protos/gossip/message.pb.go b/protos/gossip/message.pb.go index 91e541b59af..d69f0eed87d 100644 --- a/protos/gossip/message.pb.go +++ b/protos/gossip/message.pb.go @@ -1061,8 +1061,8 @@ func (m *LeadershipMessage) GetTimestamp() *PeerTime { // PeerTime defines the logical time of a peer's life type PeerTime struct { - IncNumber uint64 `protobuf:"varint,1,opt,name=inc_number,json=incNumber" json:"inc_number,omitempty"` - SeqNum uint64 `protobuf:"varint,2,opt,name=seq_num,json=seqNum" json:"seq_num,omitempty"` + IncNum uint64 `protobuf:"varint,1,opt,name=inc_num,json=incNum" json:"inc_num,omitempty"` + SeqNum uint64 `protobuf:"varint,2,opt,name=seq_num,json=seqNum" json:"seq_num,omitempty"` } func (m *PeerTime) Reset() { *m = PeerTime{} } @@ -1340,90 +1340,90 @@ var _Gossip_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("gossip/message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1355 bytes of a gzipped FileDescriptorProto + // 1349 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xcb, 0x6f, 0xdb, 0x46, - 0x13, 0x17, 0x6d, 0xbd, 0x38, 0x7a, 0x58, 0x5e, 0x3b, 0xdf, 0xc7, 0xcf, 0x5f, 0xda, 0x1a, 0x44, - 0x13, 0xb8, 0x75, 0x2a, 0x07, 0x4e, 0x1f, 0x01, 0x82, 0xa2, 0x90, 0x2d, 0xd5, 0x32, 0x1a, 0xc9, - 0x06, 0xed, 0xa0, 0x4d, 0x2f, 0x04, 0x25, 0x8e, 0x29, 0x36, 0xe4, 0x92, 0xe6, 0xae, 0xd2, 0xfa, - 0x58, 0xf4, 0xd6, 0x4b, 0xaf, 0xfd, 0x73, 0x0b, 0xee, 0x92, 0x14, 0x19, 0xda, 0x01, 0x1c, 0xa0, - 0x37, 0xce, 0xe3, 0x37, 0x33, 0x3b, 0x3b, 0x8f, 0x25, 0x6c, 0x3b, 0x01, 0x63, 0x6e, 0x78, 0xe0, - 0x23, 0x63, 0x96, 0x83, 0xfd, 0x30, 0x0a, 0x78, 0x40, 0xea, 0x92, 0xab, 0xff, 0xa1, 0x40, 0x73, - 0x44, 0xdf, 0xa2, 0x17, 0x84, 0x48, 0x34, 0x68, 0x84, 0xd6, 0x8d, 0x17, 0x58, 0xb6, 0xa6, 0xec, - 0x2a, 0x7b, 0x6d, 0x23, 0x25, 0xc9, 0x43, 0x50, 0x99, 0xeb, 0x50, 0x8b, 0x2f, 0x23, 0xd4, 0xd6, - 0x84, 0x6c, 0xc5, 0x20, 0xdf, 0xc1, 0x06, 0xc3, 0x79, 0x84, 0xdc, 0xc4, 0xc4, 0x94, 0xb6, 0xbe, - 0xab, 0xec, 0xb5, 0x0e, 0xff, 0xd3, 0x97, 0x6e, 0xfa, 0x17, 0x42, 0x9c, 0x3a, 0x32, 0xba, 0xac, - 0x40, 0xeb, 0x63, 0xe8, 0x16, 0x35, 0x3e, 0x34, 0x14, 0x7d, 0x00, 0x75, 0x69, 0x89, 0x3c, 0x81, - 0x9e, 0x4b, 0x39, 0x46, 0xd4, 0xf2, 0x46, 0xd4, 0x0e, 0x03, 0x97, 0x72, 0x61, 0x4a, 0x1d, 0x57, - 0x8c, 0x92, 0xe4, 0x48, 0x85, 0xc6, 0x3c, 0xa0, 0x1c, 0x29, 0xd7, 0xff, 0x56, 0xa1, 0x73, 0x22, - 0xc2, 0x9e, 0xc8, 0x94, 0x91, 0x6d, 0xa8, 0xd1, 0x80, 0xce, 0x51, 0xe0, 0xab, 0x86, 0x24, 0xe2, - 0x10, 0xe7, 0x0b, 0x8b, 0x52, 0xf4, 0x92, 0x30, 0x52, 0x92, 0xec, 0xc3, 0x3a, 0xb7, 0x1c, 0x91, - 0x83, 0xee, 0xe1, 0xff, 0xd2, 0x1c, 0x14, 0x6c, 0xf6, 0x2f, 0x2d, 0xc7, 0x88, 0xb5, 0xc8, 0x33, - 0x50, 0x2d, 0xcf, 0x7d, 0x8b, 0xa6, 0xcf, 0x1c, 0xad, 0x26, 0xd2, 0xb6, 0x9d, 0x42, 0x06, 0xb1, - 0x20, 0x41, 0x8c, 0x2b, 0x46, 0x53, 0x28, 0x4e, 0x98, 0x43, 0xbe, 0x84, 0x86, 0x8f, 0xbe, 0x19, - 0xe1, 0xb5, 0x56, 0x17, 0x90, 0xcc, 0xcb, 0x04, 0xfd, 0x19, 0x46, 0x6c, 0xe1, 0x86, 0x06, 0x5e, - 0x2f, 0x91, 0xf1, 0x71, 0xc5, 0xa8, 0xfb, 0xe8, 0x1b, 0x78, 0x4d, 0xbe, 0x4a, 0x51, 0x4c, 0x6b, - 0x08, 0xd4, 0xce, 0x6d, 0x28, 0x16, 0x06, 0x94, 0x61, 0x06, 0x63, 0xe4, 0x29, 0x34, 0x6d, 0x8b, - 0x5b, 0x22, 0xc0, 0xa6, 0xc0, 0x6d, 0xa5, 0xb8, 0xa1, 0xc5, 0xad, 0x55, 0x7c, 0x8d, 0x58, 0x2d, - 0x0e, 0x6f, 0x1f, 0x6a, 0x0b, 0xf4, 0xbc, 0x40, 0x53, 0x8b, 0xea, 0x32, 0x05, 0xe3, 0x58, 0x34, - 0xae, 0x18, 0x52, 0x87, 0x1c, 0x24, 0xe6, 0x6d, 0xd7, 0xd1, 0x40, 0xe8, 0x93, 0xbc, 0xf9, 0xa1, - 0xeb, 0xc8, 0x53, 0x08, 0xeb, 0x43, 0xd7, 0xc9, 0xe2, 0x89, 0x4f, 0xdf, 0x2a, 0xc7, 0xb3, 0x3a, - 0xb7, 0x40, 0xc8, 0x83, 0xb7, 0x04, 0x62, 0x19, 0xda, 0x16, 0x47, 0xad, 0x5d, 0xf6, 0xf2, 0x4a, - 0x48, 0xc6, 0x15, 0x03, 0xec, 0x8c, 0x22, 0x8f, 0xa0, 0x86, 0x7e, 0xc8, 0x6f, 0xb4, 0x8e, 0x00, - 0x74, 0x52, 0xc0, 0x28, 0x66, 0xc6, 0x07, 0x10, 0x52, 0xb2, 0x0f, 0xd5, 0x79, 0x40, 0xa9, 0xd6, - 0x15, 0x5a, 0x0f, 0x52, 0xad, 0xe3, 0x80, 0xd2, 0x11, 0xe3, 0xd6, 0xcc, 0x73, 0xd9, 0x62, 0x5c, - 0x31, 0x84, 0x12, 0x39, 0x04, 0x60, 0xdc, 0xe2, 0x68, 0xba, 0xf4, 0x2a, 0xd0, 0x36, 0x04, 0x64, - 0x33, 0x6b, 0x93, 0x58, 0x72, 0x4a, 0xaf, 0xe2, 0xec, 0xa8, 0x2c, 0x25, 0xc8, 0x11, 0x74, 0x25, - 0x86, 0x51, 0x2b, 0x64, 0x8b, 0x80, 0x6b, 0xbd, 0xe2, 0xa5, 0x67, 0xb8, 0x8b, 0x44, 0x61, 0x5c, - 0x31, 0x3a, 0x02, 0x92, 0x32, 0xc8, 0x04, 0xb6, 0x56, 0x7e, 0xcd, 0x70, 0xe9, 0x79, 0x22, 0x7f, - 0x9b, 0xc2, 0xd0, 0xc3, 0x92, 0xa1, 0xf3, 0xa5, 0xe7, 0xad, 0x12, 0xd9, 0x63, 0xef, 0xf0, 0xc9, - 0x00, 0xa4, 0xfd, 0xd8, 0x48, 0xac, 0xa4, 0x91, 0x62, 0x41, 0x19, 0xe8, 0x07, 0x1c, 0x85, 0xb9, - 0x95, 0x99, 0x36, 0xcb, 0xd1, 0x64, 0x98, 0x9e, 0x2a, 0x4a, 0x4a, 0x4e, 0xdb, 0x12, 0x36, 0xfe, - 0x7f, 0xab, 0x8d, 0xac, 0x2a, 0x3b, 0x2c, 0xcf, 0x88, 0x73, 0xe3, 0xa1, 0x65, 0xcb, 0xe2, 0x15, - 0x25, 0xba, 0x5d, 0xcc, 0xcd, 0xcb, 0x4c, 0xba, 0x2a, 0xd4, 0xce, 0x0a, 0x12, 0x97, 0xeb, 0x0b, - 0xe8, 0x84, 0x88, 0x91, 0xe9, 0xda, 0x48, 0xb9, 0xcb, 0x6f, 0xb4, 0x07, 0xc5, 0x36, 0x3c, 0x47, - 0x8c, 0x4e, 0x13, 0x59, 0x7c, 0x8c, 0x30, 0x47, 0xeb, 0x26, 0xac, 0x5f, 0x5a, 0x0e, 0xe9, 0x80, - 0xfa, 0x6a, 0x3a, 0x1c, 0x7d, 0x7f, 0x3a, 0x1d, 0x0d, 0x7b, 0x15, 0xa2, 0x42, 0x6d, 0x34, 0x39, - 0xbf, 0x7c, 0xdd, 0x53, 0x48, 0x1b, 0x9a, 0x67, 0xc6, 0x89, 0x79, 0x36, 0x7d, 0xf9, 0xba, 0xb7, - 0x16, 0xeb, 0x1d, 0x8f, 0x07, 0x53, 0x49, 0xae, 0x93, 0x1e, 0xb4, 0x05, 0x39, 0x98, 0x0e, 0xcd, - 0x33, 0xe3, 0xa4, 0x57, 0x25, 0x1b, 0xd0, 0x92, 0x0a, 0x86, 0x60, 0xd4, 0xf2, 0xa3, 0xe9, 0x2f, - 0x05, 0xd4, 0xec, 0x8a, 0xc8, 0x0e, 0x34, 0x7d, 0xe4, 0x56, 0x5c, 0xb0, 0xc9, 0x90, 0xcc, 0x68, - 0xd2, 0x07, 0x95, 0xbb, 0x3e, 0x32, 0x6e, 0xf9, 0xa1, 0x18, 0x4f, 0xad, 0xc3, 0x5e, 0xfe, 0x38, - 0x97, 0xae, 0x8f, 0xc6, 0x4a, 0x85, 0x3c, 0x80, 0x7a, 0xf8, 0xc6, 0x35, 0x5d, 0x5b, 0x4c, 0xad, - 0xb6, 0x51, 0x0b, 0xdf, 0xb8, 0xa7, 0x36, 0xf9, 0x04, 0x5a, 0xc9, 0x50, 0x33, 0x27, 0x83, 0x63, - 0xad, 0x2a, 0x64, 0x90, 0xb0, 0x26, 0x83, 0x63, 0x7d, 0x00, 0x9b, 0xa5, 0xe2, 0x23, 0x4f, 0xa0, - 0x89, 0x1e, 0xfa, 0x48, 0x39, 0xd3, 0x94, 0xdd, 0xf5, 0xbc, 0xef, 0x6c, 0x05, 0x64, 0x1a, 0xfa, - 0x37, 0xb0, 0x7d, 0x5b, 0xd9, 0xbd, 0xeb, 0x5b, 0x29, 0xf9, 0x9e, 0x42, 0xa7, 0xd0, 0x63, 0xb9, - 0x43, 0x28, 0xf9, 0x43, 0x10, 0xa8, 0xce, 0x31, 0xe2, 0xc9, 0x94, 0x16, 0xdf, 0x31, 0x6f, 0x61, - 0xb1, 0x45, 0x72, 0x5a, 0xf1, 0xad, 0xbf, 0x82, 0x76, 0xfe, 0xa6, 0xef, 0x63, 0x2e, 0x7f, 0x15, - 0xeb, 0xc5, 0xab, 0xd0, 0x7d, 0x68, 0xe5, 0xc6, 0xd2, 0xdd, 0xcb, 0xc4, 0x16, 0x83, 0x8e, 0x69, - 0x6b, 0xbb, 0xeb, 0x7b, 0xaa, 0x91, 0x92, 0xa4, 0x0f, 0x4d, 0x9f, 0x39, 0x26, 0xbf, 0x49, 0xb6, - 0x6a, 0x77, 0x35, 0xed, 0xe2, 0x6c, 0x4d, 0x98, 0x73, 0x79, 0x13, 0xa2, 0xd1, 0xf0, 0xe5, 0x87, - 0x1e, 0x40, 0x2b, 0x37, 0x66, 0xef, 0x70, 0x97, 0x8f, 0x77, 0xad, 0x54, 0x3a, 0xf7, 0x73, 0xf8, - 0x1b, 0xc0, 0x6a, 0x82, 0xde, 0xe1, 0xef, 0x53, 0xa8, 0x26, 0xbe, 0x6e, 0xaf, 0x86, 0xea, 0x07, - 0x79, 0xf6, 0xa4, 0x67, 0xb9, 0x21, 0xfe, 0xf5, 0xc4, 0x3e, 0x97, 0xf7, 0x98, 0x3e, 0x0a, 0x3e, - 0x2b, 0xbe, 0x50, 0x5a, 0x87, 0x1b, 0x19, 0x5a, 0xb2, 0xb3, 0x27, 0x8b, 0xfe, 0x35, 0x34, 0x12, - 0x1e, 0xf9, 0x2f, 0x34, 0x18, 0x5e, 0x9b, 0x74, 0xe9, 0x27, 0x61, 0xd6, 0x19, 0x5e, 0x4f, 0x97, - 0x7e, 0x5c, 0x55, 0xb9, 0xdb, 0x10, 0xdf, 0xfa, 0x9f, 0x0a, 0xb4, 0xf3, 0x4f, 0x00, 0xd2, 0x07, - 0xf0, 0xb3, 0x4d, 0x9d, 0xb8, 0xed, 0x16, 0x77, 0xb8, 0x91, 0xd3, 0xb8, 0xf7, 0x14, 0xd8, 0x81, - 0x66, 0x36, 0x03, 0x65, 0xaf, 0x67, 0xb4, 0xfe, 0xbb, 0x02, 0x9b, 0xa5, 0x59, 0x7a, 0x57, 0x8f, - 0xdc, 0xd7, 0xf1, 0x23, 0xe8, 0xba, 0xcc, 0xb4, 0x71, 0xee, 0x59, 0x91, 0xc5, 0xdd, 0x80, 0x8a, - 0x1b, 0x69, 0x1a, 0x1d, 0x97, 0x0d, 0x57, 0x4c, 0xfd, 0x08, 0x9a, 0x29, 0x9a, 0x7c, 0x04, 0xe0, - 0xd2, 0x79, 0x9c, 0xc9, 0x19, 0x46, 0x49, 0x32, 0x55, 0x97, 0xce, 0xa7, 0x82, 0x91, 0x4f, 0xf4, - 0x5a, 0x3e, 0xd1, 0xfa, 0x15, 0x6c, 0x96, 0xde, 0x48, 0xe4, 0x05, 0xf4, 0x18, 0x7a, 0x57, 0x62, - 0x39, 0x46, 0xbe, 0x8c, 0x40, 0x29, 0x86, 0x9d, 0xd5, 0xea, 0x46, 0xac, 0x79, 0xba, 0x52, 0x8c, - 0x0b, 0xef, 0x0d, 0x0d, 0x7e, 0xa5, 0xa2, 0xc0, 0xda, 0x86, 0x24, 0xf4, 0x19, 0x90, 0xf2, 0xab, - 0x8a, 0x3c, 0x86, 0x9a, 0x78, 0xc4, 0xdd, 0x39, 0x17, 0xa5, 0x58, 0x34, 0x0c, 0x5a, 0xf6, 0x7b, - 0x1a, 0x06, 0x2d, 0x5b, 0xff, 0x11, 0xea, 0xd2, 0x47, 0x7c, 0x73, 0x58, 0x78, 0xe5, 0x1a, 0x19, - 0xfd, 0xde, 0x66, 0xbf, 0x7d, 0xee, 0xeb, 0x0d, 0xa8, 0x89, 0x47, 0x8e, 0xfe, 0x13, 0x90, 0xf2, - 0x2a, 0x27, 0xba, 0xd8, 0xfe, 0x11, 0x37, 0x8b, 0xb5, 0xdc, 0x12, 0xcc, 0x0b, 0x59, 0xd0, 0x1f, - 0x43, 0x0b, 0xa9, 0x6d, 0x16, 0x2f, 0x41, 0x45, 0x6a, 0x4b, 0xb9, 0x7e, 0x04, 0x5b, 0xb7, 0x2c, - 0x78, 0xb2, 0x0f, 0xcd, 0xa4, 0x6d, 0xd2, 0xdd, 0x51, 0xea, 0xab, 0x4c, 0xe1, 0xf3, 0x6f, 0xa1, - 0x95, 0x6b, 0xd5, 0x77, 0x77, 0x70, 0x07, 0xd4, 0xa3, 0x97, 0x67, 0xc7, 0x3f, 0x98, 0x93, 0x8b, - 0x93, 0x9e, 0x12, 0xaf, 0xda, 0xd3, 0xe1, 0x68, 0x7a, 0x79, 0x7a, 0xf9, 0x5a, 0x70, 0xd6, 0x0e, - 0x7f, 0x81, 0xba, 0x1c, 0x95, 0xe4, 0x39, 0xb4, 0xe5, 0xd7, 0x05, 0x8f, 0xd0, 0xf2, 0x49, 0x29, - 0xe1, 0x3b, 0x25, 0x8e, 0x5e, 0xd9, 0x53, 0x9e, 0x2a, 0xe4, 0x31, 0x54, 0xcf, 0x5d, 0xea, 0x90, - 0xe2, 0xe3, 0x70, 0xa7, 0x48, 0xea, 0x95, 0xa3, 0x2f, 0x7e, 0xde, 0x77, 0x5c, 0xbe, 0x58, 0xce, - 0xfa, 0xf3, 0xc0, 0x3f, 0x58, 0xdc, 0x84, 0x18, 0x79, 0x68, 0x3b, 0x18, 0x1d, 0x5c, 0x59, 0xb3, - 0xc8, 0x9d, 0x1f, 0x88, 0xff, 0x32, 0x76, 0x20, 0x61, 0xb3, 0xba, 0x20, 0x9f, 0xfd, 0x13, 0x00, - 0x00, 0xff, 0xff, 0xd9, 0xde, 0x9d, 0x8c, 0xbe, 0x0d, 0x00, 0x00, + 0x13, 0x17, 0x6d, 0x3d, 0x47, 0x0f, 0xcb, 0x6b, 0xe7, 0xfb, 0xf8, 0xf9, 0x0b, 0x5a, 0x83, 0x68, + 0x02, 0xb7, 0x4e, 0xe5, 0xc0, 0xe9, 0x23, 0x40, 0x5a, 0x14, 0xb2, 0xa5, 0x5a, 0x46, 0x23, 0xd9, + 0xa0, 0x15, 0xb4, 0xe9, 0x85, 0x58, 0x8b, 0x63, 0x8a, 0x0d, 0xb9, 0xa4, 0xb9, 0xab, 0xb4, 0x3e, + 0x16, 0xbd, 0xf5, 0xd2, 0x6b, 0xff, 0xdc, 0x82, 0xbb, 0x24, 0x45, 0x46, 0x76, 0x00, 0x07, 0xe8, + 0x8d, 0xf3, 0xf8, 0xcd, 0xcc, 0xce, 0xce, 0x63, 0x09, 0xdb, 0x4e, 0xc0, 0xb9, 0x1b, 0x1e, 0xf8, + 0xc8, 0x39, 0x75, 0xb0, 0x17, 0x46, 0x81, 0x08, 0x48, 0x55, 0x71, 0x8d, 0x3f, 0x34, 0xa8, 0x0f, + 0xd9, 0x5b, 0xf4, 0x82, 0x10, 0x89, 0x0e, 0xb5, 0x90, 0xde, 0x78, 0x01, 0xb5, 0x75, 0x6d, 0x57, + 0xdb, 0x6b, 0x99, 0x29, 0x49, 0x1e, 0x42, 0x83, 0xbb, 0x0e, 0xa3, 0x62, 0x11, 0xa1, 0xbe, 0x26, + 0x65, 0x4b, 0x06, 0xf9, 0x0e, 0x36, 0x38, 0xce, 0x22, 0x14, 0x16, 0x26, 0xa6, 0xf4, 0xf5, 0x5d, + 0x6d, 0xaf, 0x79, 0xf8, 0x9f, 0x9e, 0x72, 0xd3, 0xbb, 0x90, 0xe2, 0xd4, 0x91, 0xd9, 0xe1, 0x05, + 0xda, 0x18, 0x41, 0xa7, 0xa8, 0xf1, 0xa1, 0xa1, 0x18, 0x7d, 0xa8, 0x2a, 0x4b, 0xe4, 0x09, 0x74, + 0x5d, 0x26, 0x30, 0x62, 0xd4, 0x1b, 0x32, 0x3b, 0x0c, 0x5c, 0x26, 0xa4, 0xa9, 0xc6, 0xa8, 0x64, + 0xae, 0x48, 0x8e, 0x1a, 0x50, 0x9b, 0x05, 0x4c, 0x20, 0x13, 0xc6, 0xdf, 0x0d, 0x68, 0x9f, 0xc8, + 0xb0, 0xc7, 0x2a, 0x65, 0x64, 0x1b, 0x2a, 0x2c, 0x60, 0x33, 0x94, 0xf8, 0xb2, 0xa9, 0x88, 0x38, + 0xc4, 0xd9, 0x9c, 0x32, 0x86, 0x5e, 0x12, 0x46, 0x4a, 0x92, 0x7d, 0x58, 0x17, 0xd4, 0x91, 0x39, + 0xe8, 0x1c, 0xfe, 0x2f, 0xcd, 0x41, 0xc1, 0x66, 0x6f, 0x4a, 0x1d, 0x33, 0xd6, 0x22, 0xcf, 0xa0, + 0x41, 0x3d, 0xf7, 0x2d, 0x5a, 0x3e, 0x77, 0xf4, 0x8a, 0x4c, 0xdb, 0x76, 0x0a, 0xe9, 0xc7, 0x82, + 0x04, 0x31, 0x2a, 0x99, 0x75, 0xa9, 0x38, 0xe6, 0x0e, 0xf9, 0x02, 0x6a, 0x3e, 0xfa, 0x56, 0x84, + 0xd7, 0x7a, 0x55, 0x42, 0x32, 0x2f, 0x63, 0xf4, 0x2f, 0x31, 0xe2, 0x73, 0x37, 0x34, 0xf1, 0x7a, + 0x81, 0x5c, 0x8c, 0x4a, 0x66, 0xd5, 0x47, 0xdf, 0xc4, 0x6b, 0xf2, 0x65, 0x8a, 0xe2, 0x7a, 0x4d, + 0xa2, 0x76, 0x6e, 0x43, 0xf1, 0x30, 0x60, 0x1c, 0x33, 0x18, 0x27, 0x4f, 0xa1, 0x6e, 0x53, 0x41, + 0x65, 0x80, 0x75, 0x89, 0xdb, 0x4a, 0x71, 0x03, 0x2a, 0xe8, 0x32, 0xbe, 0x5a, 0xac, 0x16, 0x87, + 0xb7, 0x0f, 0x95, 0x39, 0x7a, 0x5e, 0xa0, 0x37, 0x8a, 0xea, 0x2a, 0x05, 0xa3, 0x58, 0x34, 0x2a, + 0x99, 0x4a, 0x87, 0x1c, 0x24, 0xe6, 0x6d, 0xd7, 0xd1, 0x41, 0xea, 0x93, 0xbc, 0xf9, 0x81, 0xeb, + 0xa8, 0x53, 0x48, 0xeb, 0x03, 0xd7, 0xc9, 0xe2, 0x89, 0x4f, 0xdf, 0x5c, 0x8d, 0x67, 0x79, 0x6e, + 0x89, 0x50, 0x07, 0x6f, 0x4a, 0xc4, 0x22, 0xb4, 0xa9, 0x40, 0xbd, 0xb5, 0xea, 0xe5, 0x95, 0x94, + 0x8c, 0x4a, 0x26, 0xd8, 0x19, 0x45, 0x1e, 0x41, 0x05, 0xfd, 0x50, 0xdc, 0xe8, 0x6d, 0x09, 0x68, + 0xa7, 0x80, 0x61, 0xcc, 0x8c, 0x0f, 0x20, 0xa5, 0x64, 0x1f, 0xca, 0xb3, 0x80, 0x31, 0xbd, 0x23, + 0xb5, 0x1e, 0xa4, 0x5a, 0xc7, 0x01, 0x63, 0x43, 0x2e, 0xe8, 0xa5, 0xe7, 0xf2, 0xf9, 0xa8, 0x64, + 0x4a, 0x25, 0x72, 0x08, 0xc0, 0x05, 0x15, 0x68, 0xb9, 0xec, 0x2a, 0xd0, 0x37, 0x24, 0x64, 0x33, + 0x6b, 0x93, 0x58, 0x72, 0xca, 0xae, 0xe2, 0xec, 0x34, 0x78, 0x4a, 0x90, 0x23, 0xe8, 0x28, 0x0c, + 0x67, 0x34, 0xe4, 0xf3, 0x40, 0xe8, 0xdd, 0xe2, 0xa5, 0x67, 0xb8, 0x8b, 0x44, 0x61, 0x54, 0x32, + 0xdb, 0x12, 0x92, 0x32, 0xc8, 0x18, 0xb6, 0x96, 0x7e, 0xad, 0x70, 0xe1, 0x79, 0x32, 0x7f, 0x9b, + 0xd2, 0xd0, 0xc3, 0x15, 0x43, 0xe7, 0x0b, 0xcf, 0x5b, 0x26, 0xb2, 0xcb, 0xdf, 0xe1, 0x93, 0x3e, + 0x28, 0xfb, 0xb1, 0x91, 0x58, 0x49, 0x27, 0xc5, 0x82, 0x32, 0xd1, 0x0f, 0x04, 0x4a, 0x73, 0x4b, + 0x33, 0x2d, 0x9e, 0xa3, 0xc9, 0x20, 0x3d, 0x55, 0x94, 0x94, 0x9c, 0xbe, 0x25, 0x6d, 0xfc, 0xff, + 0x56, 0x1b, 0x59, 0x55, 0xb6, 0x79, 0x9e, 0x11, 0xe7, 0xc6, 0x43, 0x6a, 0xab, 0xe2, 0x95, 0x25, + 0xba, 0x5d, 0xcc, 0xcd, 0xcb, 0x4c, 0xba, 0x2c, 0xd4, 0xf6, 0x12, 0x12, 0x97, 0xeb, 0x0b, 0x68, + 0x87, 0x88, 0x91, 0xe5, 0xda, 0xc8, 0x84, 0x2b, 0x6e, 0xf4, 0x07, 0xc5, 0x36, 0x3c, 0x47, 0x8c, + 0x4e, 0x13, 0x59, 0x7c, 0x8c, 0x30, 0x47, 0x1b, 0x16, 0xac, 0x4f, 0xa9, 0x43, 0xda, 0xd0, 0x78, + 0x35, 0x19, 0x0c, 0xbf, 0x3f, 0x9d, 0x0c, 0x07, 0xdd, 0x12, 0x69, 0x40, 0x65, 0x38, 0x3e, 0x9f, + 0xbe, 0xee, 0x6a, 0xa4, 0x05, 0xf5, 0x33, 0xf3, 0xc4, 0x3a, 0x9b, 0xbc, 0x7c, 0xdd, 0x5d, 0x8b, + 0xf5, 0x8e, 0x47, 0xfd, 0x89, 0x22, 0xd7, 0x49, 0x17, 0x5a, 0x92, 0xec, 0x4f, 0x06, 0xd6, 0x99, + 0x79, 0xd2, 0x2d, 0x93, 0x0d, 0x68, 0x2a, 0x05, 0x53, 0x32, 0x2a, 0xf9, 0xd1, 0xf4, 0x97, 0x06, + 0x8d, 0xec, 0x8a, 0xc8, 0x0e, 0xd4, 0x7d, 0x14, 0x34, 0x2e, 0xd8, 0x64, 0x48, 0x66, 0x34, 0xe9, + 0x41, 0x43, 0xb8, 0x3e, 0x72, 0x41, 0xfd, 0x50, 0x8e, 0xa7, 0xe6, 0x61, 0x37, 0x7f, 0x9c, 0xa9, + 0xeb, 0xa3, 0xb9, 0x54, 0x21, 0x0f, 0xa0, 0x1a, 0xbe, 0x71, 0x2d, 0xd7, 0x96, 0x53, 0xab, 0x65, + 0x56, 0xc2, 0x37, 0xee, 0xa9, 0x4d, 0x3e, 0x86, 0x66, 0x32, 0xd4, 0xac, 0x71, 0xff, 0x58, 0x2f, + 0x4b, 0x19, 0x24, 0xac, 0x71, 0xff, 0xd8, 0xe8, 0xc3, 0xe6, 0x4a, 0xf1, 0x91, 0x27, 0x50, 0x47, + 0x0f, 0x7d, 0x64, 0x82, 0xeb, 0xda, 0xee, 0x7a, 0xde, 0x77, 0xb6, 0x02, 0x32, 0x0d, 0xe3, 0x6b, + 0xd8, 0xbe, 0xad, 0xec, 0xde, 0xf5, 0xad, 0xad, 0xf8, 0x9e, 0x40, 0xbb, 0xd0, 0x63, 0xb9, 0x43, + 0x68, 0xf9, 0x43, 0x10, 0x28, 0xcf, 0x30, 0x12, 0xc9, 0x94, 0x96, 0xdf, 0x31, 0x6f, 0x4e, 0xf9, + 0x3c, 0x39, 0xad, 0xfc, 0x36, 0x5e, 0x41, 0x2b, 0x7f, 0xd3, 0xf7, 0x31, 0x97, 0xbf, 0x8a, 0xf5, + 0xe2, 0x55, 0x18, 0x3e, 0x34, 0x73, 0x63, 0xe9, 0xee, 0x65, 0x62, 0xcb, 0x41, 0xc7, 0xf5, 0xb5, + 0xdd, 0xf5, 0xbd, 0x86, 0x99, 0x92, 0xa4, 0x07, 0x75, 0x9f, 0x3b, 0x96, 0xb8, 0x49, 0xb6, 0x6a, + 0x67, 0x39, 0xed, 0xe2, 0x6c, 0x8d, 0xb9, 0x33, 0xbd, 0x09, 0xd1, 0xac, 0xf9, 0xea, 0xc3, 0x08, + 0xa0, 0x99, 0x1b, 0xb3, 0x77, 0xb8, 0xcb, 0xc7, 0xbb, 0xb6, 0x52, 0x3a, 0xf7, 0x73, 0xf8, 0x1b, + 0xc0, 0x72, 0x82, 0xde, 0xe1, 0xef, 0x13, 0x28, 0x27, 0xbe, 0x6e, 0xaf, 0x86, 0xf2, 0x07, 0x79, + 0xf6, 0x94, 0x67, 0xb5, 0x21, 0xfe, 0xf5, 0xc4, 0x3e, 0x57, 0xf7, 0x98, 0x3e, 0x0a, 0x3e, 0x2d, + 0xbe, 0x50, 0x9a, 0x87, 0x1b, 0x19, 0x5a, 0xb1, 0xb3, 0x27, 0x8b, 0xf1, 0x15, 0xd4, 0x12, 0x1e, + 0xf9, 0x2f, 0xd4, 0x38, 0x5e, 0x5b, 0x6c, 0xe1, 0x27, 0x61, 0x56, 0x39, 0x5e, 0x4f, 0x16, 0x7e, + 0x5c, 0x55, 0xb9, 0xdb, 0x90, 0xdf, 0xc6, 0x9f, 0x1a, 0xb4, 0xf2, 0x4f, 0x00, 0xd2, 0x03, 0xf0, + 0xb3, 0x4d, 0x9d, 0xb8, 0xed, 0x14, 0x77, 0xb8, 0x99, 0xd3, 0xb8, 0xf7, 0x14, 0xd8, 0x81, 0x7a, + 0x36, 0x03, 0x55, 0xaf, 0x67, 0xb4, 0xf1, 0xbb, 0x06, 0x9b, 0x2b, 0xb3, 0xf4, 0xae, 0x1e, 0xb9, + 0xaf, 0xe3, 0x47, 0xd0, 0x71, 0xb9, 0x65, 0xe3, 0xcc, 0xa3, 0x11, 0x15, 0x6e, 0xc0, 0xe4, 0x8d, + 0xd4, 0xcd, 0xb6, 0xcb, 0x07, 0x4b, 0xa6, 0xf1, 0x0d, 0xd4, 0x53, 0x74, 0x9c, 0x49, 0x97, 0xcd, + 0xf2, 0x99, 0x74, 0xd9, 0x2c, 0xce, 0x64, 0x2e, 0xc5, 0x6b, 0xf9, 0x14, 0x1b, 0x57, 0xb0, 0xb9, + 0xf2, 0x3a, 0x22, 0x2f, 0xa0, 0xcb, 0xd1, 0xbb, 0x92, 0x6b, 0x31, 0xf2, 0x95, 0x6f, 0xad, 0x18, + 0x70, 0x56, 0xa5, 0x1b, 0xb1, 0xe6, 0xe9, 0x52, 0x31, 0x2e, 0xb9, 0x37, 0x2c, 0xf8, 0x95, 0xc9, + 0xd2, 0x6a, 0x99, 0x8a, 0x30, 0x2e, 0x81, 0xac, 0xbe, 0xa7, 0xc8, 0x63, 0xa8, 0xc8, 0xe7, 0xdb, + 0x9d, 0x13, 0x51, 0x89, 0x65, 0xab, 0x20, 0xb5, 0xdf, 0xd3, 0x2a, 0x48, 0x6d, 0xe3, 0x47, 0xa8, + 0x2a, 0x1f, 0xf1, 0x9d, 0x61, 0xe1, 0x7d, 0x6b, 0x66, 0xf4, 0x7b, 0xdb, 0xfc, 0xf6, 0x89, 0x6f, + 0xd4, 0xa0, 0x22, 0x9f, 0x37, 0xc6, 0x4f, 0x40, 0x56, 0x97, 0x38, 0x31, 0xe4, 0xde, 0x8f, 0x84, + 0x55, 0xac, 0xe2, 0xa6, 0x64, 0x5e, 0xa8, 0x52, 0xfe, 0x08, 0x9a, 0xc8, 0x6c, 0xab, 0x78, 0x09, + 0x0d, 0x64, 0xb6, 0x92, 0x1b, 0x47, 0xb0, 0x75, 0xcb, 0x6a, 0x27, 0xfb, 0x50, 0x4f, 0x1a, 0x26, + 0xdd, 0x1a, 0x2b, 0x1d, 0x95, 0x29, 0x7c, 0xf6, 0x2d, 0x34, 0x73, 0x4d, 0xfa, 0xee, 0xf6, 0x6d, + 0x43, 0xe3, 0xe8, 0xe5, 0xd9, 0xf1, 0x0f, 0xd6, 0xf8, 0xe2, 0xa4, 0xab, 0xc5, 0x4b, 0xf6, 0x74, + 0x30, 0x9c, 0x4c, 0x4f, 0xa7, 0xaf, 0x25, 0x67, 0xed, 0xf0, 0x17, 0xa8, 0xaa, 0x21, 0x49, 0x9e, + 0x43, 0x4b, 0x7d, 0x5d, 0x88, 0x08, 0xa9, 0x4f, 0x56, 0x12, 0xbe, 0xb3, 0xc2, 0x31, 0x4a, 0x7b, + 0xda, 0x53, 0x8d, 0x3c, 0x86, 0xf2, 0xb9, 0xcb, 0x1c, 0x52, 0x7c, 0x16, 0xee, 0x14, 0x49, 0xa3, + 0x74, 0xf4, 0xf9, 0xcf, 0xfb, 0x8e, 0x2b, 0xe6, 0x8b, 0xcb, 0xde, 0x2c, 0xf0, 0x0f, 0xe6, 0x37, + 0x21, 0x46, 0x1e, 0xda, 0x0e, 0x46, 0x07, 0x57, 0xf4, 0x32, 0x72, 0x67, 0x07, 0xf2, 0x8f, 0x8c, + 0x1f, 0x28, 0xd8, 0x65, 0x55, 0x92, 0xcf, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x85, 0x3e, 0x53, + 0xef, 0xb8, 0x0d, 0x00, 0x00, } diff --git a/protos/gossip/message.proto b/protos/gossip/message.proto index f36de925818..e05177556de 100644 --- a/protos/gossip/message.proto +++ b/protos/gossip/message.proto @@ -242,8 +242,8 @@ message LeadershipMessage { // PeerTime defines the logical time of a peer's life message PeerTime { - uint64 inc_number = 1; - uint64 seq_num = 2; + uint64 inc_num = 1; + uint64 seq_num = 2; } // MembershipRequest is used to ask membership information