Replace Probe method input parameter

As it already exists RemotePeer struct which contains Endpoint and PKIID property, Probe method can use RemotePeer as input parameter directly. See https://jira.hyperledger.org/browse/FAB-1146 Change-Id: Id26077db6360f49087cc8e1d1ab14eefd2c67317 Signed-off-by: grapebaba <281165273@qq.com>
hyperledger · Nov 18, 2016 · d5b4dbc · d5b4dbc
1 parent 97f8584
commit d5b4dbc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/gossip/comm/comm.go b/gossip/comm/comm.go
@@ -34,7 +34,7 @@ type Comm interface {
 	Send(msg *proto.GossipMessage, peers ...*RemotePeer)
 
 	// Probe probes a remote node and returns nil if its responsive
-	Probe(endpoint string, pkiID common.PKIidType) error
+	Probe(peer *RemotePeer) error
 
 	// Accept returns a dedicated read-only channel for messages sent by other nodes that match a certain predicate.
 	// Each message from the channel can be used to send a reply back to the sender

diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
@@ -250,18 +250,18 @@ func (c *commImpl) isStopping() bool {
 	return atomic.LoadInt32(&c.stopping) == int32(1)
 }
 
-func (c *commImpl) Probe(endpoint string, pkiID common.PKIidType) error {
+func (c *commImpl) Probe(peer *RemotePeer) error {
 	if c.isStopping() {
 		return fmt.Errorf("Stopping!")
 	}
-	c.logger.Debug("Entering, endpoint:", endpoint, "PKIID:", pkiID)
+	c.logger.Debug("Entering, endpoint:", peer.Endpoint, "PKIID:", peer.PKIID)
 	var err error
 
 	opts := c.opts
 	if opts == nil {
 		opts = []grpc.DialOption{grpc.WithInsecure(), grpc.WithTimeout(dialTimeout)}
 	}
-	cc, err := grpc.Dial(endpoint, append(opts, grpc.WithBlock())...)
+	cc, err := grpc.Dial(peer.Endpoint, append(opts, grpc.WithBlock())...)
 	if err != nil {
 		c.logger.Debug("Returning", err)
 		return err

diff --git a/gossip/comm/comm_test.go b/gossip/comm/comm_test.go
@@ -429,16 +429,16 @@ func TestProbe(t *testing.T) {
 	defer comm1.Stop()
 	comm2, _ := newCommInstance(6612, naiveSec)
 	time.Sleep(time.Duration(1) * time.Second)
-	assert.NoError(t, comm1.Probe("localhost:6612", []byte("localhost:6612")))
-	assert.Error(t, comm1.Probe("localhost:9012", []byte("localhost:9012")))
+	assert.NoError(t, comm1.Probe(&RemotePeer{Endpoint: "localhost:6612", PKIID: []byte("localhost:6612")}))
+	assert.Error(t, comm1.Probe(&RemotePeer{Endpoint: "localhost:9012", PKIID: []byte("localhost:9012")}))
 	comm2.Stop()
 	time.Sleep(time.Second)
-	assert.Error(t, comm1.Probe("localhost:6612", []byte("localhost:6612")))
+	assert.Error(t, comm1.Probe(&RemotePeer{Endpoint: "localhost:6612", PKIID: []byte("localhost:6612")}))
 	comm2, _ = newCommInstance(6612, naiveSec)
 	defer comm2.Stop()
 	time.Sleep(time.Duration(1) * time.Second)
-	assert.NoError(t, comm2.Probe("localhost:6611", []byte("localhost:6611")))
-	assert.NoError(t, comm1.Probe("localhost:6612", []byte("localhost:6612")))
+	assert.NoError(t, comm2.Probe(&RemotePeer{Endpoint: "localhost:6611", PKIID: []byte("localhost:6611")}))
+	assert.NoError(t, comm1.Probe(&RemotePeer{Endpoint: "localhost:6612", PKIID: []byte("localhost:6612")}))
 }
 
 func TestPresumedDead(t *testing.T) {

diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go
@@ -474,7 +474,7 @@ func (da *discoveryAdapter) SendToPeer(peer *discovery.NetworkMember, msg *proto
 }
 
 func (da *discoveryAdapter) Ping(peer *discovery.NetworkMember) bool {
-	return da.c.Probe(peer.Endpoint, peer.PKIid) == nil
+	return da.c.Probe(&comm.RemotePeer{Endpoint: peer.Endpoint, PKIID: peer.PKIid}) == nil
 }
 
 func (da *discoveryAdapter) Accept() <-chan *proto.GossipMessage {