[FAB-12327] Return regular envelopes in gossip support

This change set makes gossip support for discovery,
return only regular envelopes.

Change-Id: I5bab9c59579b33680c16af18c7f955264eae766a
Signed-off-by: yacovm <yacovm@il.ibm.com>

Author: yacovm

discovery/support/gossip/support.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hyperledger/fabric/gossip/common"
 	"github.com/hyperledger/fabric/gossip/discovery"
 	gossip2 "github.com/hyperledger/fabric/gossip/gossip"
+	"github.com/hyperledger/fabric/protos/gossip"
 )
 
 // DiscoverySupport implements support that is used for service discovery
@@ -48,6 +49,19 @@ func (s *DiscoverySupport) PeersOfChannel(chain common.ChainID) discovery.Member
 func (s *DiscoverySupport) Peers() discovery.Members {
 	peers := s.Gossip.Peers()
 	peers = append(peers, s.Gossip.SelfMembershipInfo())
-	// Return only the peers that have an external endpoint.
-	return discovery.Members(peers).Filter(discovery.HasExternalEndpoint)
+	// Return only the peers that have an external endpoint, and sanitizes the envelopes.
+	return discovery.Members(peers).Filter(discovery.HasExternalEndpoint).Map(sanitizeEnvelope)
+}
+
+func sanitizeEnvelope(member discovery.NetworkMember) discovery.NetworkMember {
+	// Make a local copy of the member
+	returnedMember := member
+	if returnedMember.Envelope == nil {
+		return returnedMember
+	}
+	returnedMember.Envelope = &gossip.Envelope{
+		Payload:   member.Envelope.Payload,
+		Signature: member.Envelope.Signature,
+	}
+	return returnedMember
 }

discovery/support/gossip/support_test.go

@@ -26,11 +26,24 @@ func TestChannelExists(t *testing.T) {
 func TestPeers(t *testing.T) {
 	g := &mocks.Gossip{}
 	sup := gossipSupport.NewDiscoverySupport(g)
-	peers := []discovery.NetworkMember{{PKIid: common.PKIidType("p1"), Endpoint: "p1"}, {PKIid: common.PKIidType("p2")}}
+	p1Envelope := &gossip.Envelope{
+		Payload: []byte{4, 5, 6},
+		SecretEnvelope: &gossip.SecretEnvelope{
+			Payload: []byte{1, 2, 3},
+		},
+	}
+	peers := []discovery.NetworkMember{
+		{PKIid: common.PKIidType("p1"), Endpoint: "p1", Envelope: p1Envelope},
+		{PKIid: common.PKIidType("p2")},
+	}
 	g.PeersReturnsOnCall(0, peers)
 	g.SelfMembershipInfoReturnsOnCall(0, discovery.NetworkMember{PKIid: common.PKIidType("p0"), Endpoint: "p0"})
-	expected := discovery.Members{{PKIid: common.PKIidType("p1"), Endpoint: "p1"}, {PKIid: common.PKIidType("p0"), Endpoint: "p0"}}
-	assert.Equal(t, expected, sup.Peers())
+	p1ExpectedEnvelope := &gossip.Envelope{
+		Payload: []byte{4, 5, 6},
+	}
+	expected := discovery.Members{{PKIid: common.PKIidType("p1"), Endpoint: "p1", Envelope: p1ExpectedEnvelope}, {PKIid: common.PKIidType("p0"), Endpoint: "p0"}}
+	actual := sup.Peers()
+	assert.Equal(t, expected, actual)
 }
 
 func TestPeersOfChannel(t *testing.T) {

gossip/discovery/discovery.go

@@ -171,6 +171,15 @@ func (members Members) Filter(filter func(member NetworkMember) bool) Members {
 	return res
 }
 
+// Map invokes the given function to every NetworkMember among the Members
+func (members Members) Map(f func(member NetworkMember) NetworkMember) Members {
+	var res Members
+	for _, m := range members {
+		res = append(res, f(m))
+	}
+	return res
+}
+
 // HaveExternalEndpoints selects network members that have external endpoints
 func HasExternalEndpoint(member NetworkMember) bool {
 	return member.Endpoint != ""

gossip/discovery/discovery_test.go

@@ -1282,6 +1282,29 @@ func TestFilter(t *testing.T) {
 	assert.Equal(t, Members{members[1]}, res)
 }
 
+func TestMap(t *testing.T) {
+	members := Members{
+		{PKIid: common.PKIidType("p0"), Endpoint: "p0"},
+		{PKIid: common.PKIidType("p1"), Endpoint: "p1"},
+	}
+	expectedMembers := Members{
+		{PKIid: common.PKIidType("p0"), Endpoint: "p0", Properties: &proto.Properties{LedgerHeight: 2}},
+		{PKIid: common.PKIidType("p1"), Endpoint: "p1", Properties: &proto.Properties{LedgerHeight: 2}},
+	}
+
+	addProperty := func(member NetworkMember) NetworkMember {
+		member.Properties = &proto.Properties{
+			LedgerHeight: 2,
+		}
+		return member
+	}
+
+	assert.Equal(t, expectedMembers, members.Map(addProperty))
+	// Ensure original members didn't change
+	assert.Nil(t, members[0].Properties)
+	assert.Nil(t, members[1].Properties)
+}
+
 func TestMembersIntersect(t *testing.T) {
 	members1 := Members{
 		{PKIid: common.PKIidType("p0"), Endpoint: "p0"},