Decouple gossip.LeadershipMsg and networkMember

The proto message that is used for leader election
contains Member, which contains endpoint, metadata and pkiID.
There is no use of endpoint in the leader election module,
and also- the use of metadata is abuse since its a []byte,
but all we do is to put there a bool.
I replaced the use of Member by pkiID and a bool value
that was previously in the metadata.

Change-Id: Id31395c5978f6b8e1791bad35d28a8a66e6cf664
Signed-off-by: Yacov Manevich <yacovm@il.ibm.com>

gossip/election/adapter.go

@@ -18,7 +18,6 @@ package election
 
 import (
 	"bytes"
-	"strconv"
 	"sync"
 	"time"
 
@@ -35,16 +34,15 @@ type msgImpl struct {
 }
 
 func (mi *msgImpl) SenderID() string {
-	return string(mi.msg.GetLeadershipMsg().GetMembership().PkiID)
+	return string(mi.msg.GetLeadershipMsg().PkiID)
 }
 
 func (mi *msgImpl) IsProposal() bool {
 	return !mi.IsDeclaration()
 }
 
 func (mi *msgImpl) IsDeclaration() bool {
-	isDeclaration, _ := strconv.ParseBool(string(mi.msg.GetLeadershipMsg().GetMembership().Metadata))
-	return isDeclaration
+	return mi.msg.GetLeadershipMsg().IsDeclaration
 }
 
 type peerImpl struct {
@@ -136,7 +134,7 @@ func (ai *adapterImpl) Accept() <-chan Msg {
 			verifier := func(identity []byte, signature, message []byte) error {
 				return ai.mcs.Verify(identity, signature, message)
 			}
-			identity, err := ai.mcs.Get(leadershipMsg.GetMembership().PkiID)
+			identity, err := ai.mcs.Get(leadershipMsg.PkiID)
 			if err != nil {
 				ai.logger.Error("Failed verify, can't get identity", leadershipMsg, ":", err)
 				return false
@@ -174,15 +172,9 @@ func (ai *adapterImpl) CreateMessage(isDeclaration bool) Msg {
 	ai.seqNum++
 	seqNum := ai.seqNum
 
-	metadata := []byte{}
-	metadata = strconv.AppendBool(metadata, isDeclaration)
-
 	leadershipMsg := &proto.LeadershipMessage{
-		Membership: &proto.Member{
-			PkiID:    ai.self.PKIid,
-			Endpoint: ai.self.Endpoint,
-			Metadata: metadata,
-		},
+		PkiID:         ai.self.PKIid,
+		IsDeclaration: isDeclaration,
 		Timestamp: &proto.PeerTime{
 			IncNumber: ai.incTime,
 			SeqNum:    seqNum,

gossip/gossip/gossip_test.go

@@ -909,16 +909,9 @@ func createDataMsg(seqnum uint64, data []byte, hash string, channel common.Chain
 }
 
 func createLeadershipMsg(isDeclaration bool, channel common.ChainID, incTime uint64, seqNum uint64, endpoint string, pkiid []byte) *proto.GossipMessage {
-
-	metadata := []byte{}
-	metadata = strconv.AppendBool(metadata, isDeclaration)
-
 	leadershipMsg := &proto.LeadershipMessage{
-		Membership: &proto.Member{
-			PkiID:    pkiid,
-			Endpoint: endpoint,
-			Metadata: metadata,
-		},
+		IsDeclaration: isDeclaration,
+		PkiID:         pkiid,
 		Timestamp: &proto.PeerTime{
 			IncNumber: incTime,
 			SeqNum:    seqNum,

protos/gossip/extensions.go

@@ -110,7 +110,7 @@ func aliveInvalidationPolicy(thisMsg *AliveMessage, thatMsg *AliveMessage) commo
 }
 
 func leaderInvalidationPolicy(thisMsg *LeadershipMessage, thatMsg *LeadershipMessage) common.InvalidationResult {
-	if !bytes.Equal(thisMsg.Membership.PkiID, thatMsg.Membership.PkiID) {
+	if !bytes.Equal(thisMsg.PkiID, thatMsg.PkiID) {
 		return common.MessageNoAction
 	}