Test: remove member from channel

Author: gotoxu

discovery/service.go

@@ -213,8 +213,8 @@ func (d *gossipDiscoveryService) GetMembership() []common.NetworkMember {
 }
 
 func (d *gossipDiscoveryService) Stop() {
-	defer logging.Info("Stopped")
-	logging.Info("Stopping")
+	defer logging.Info("Stopped discovery")
+	logging.Info("Stopping discovery")
 
 	d.lock.Lock()
 	defer d.lock.Unlock()

filter/filter_test.go

@@ -54,3 +54,20 @@ func TestSelecdtPeers(t *testing.T) {
 	assert.Len(t, SelectPeers(3, peers, CombineRoutingFilters(SelectAllPolicy, pa)), 1)
 	assert.Len(t, SelectPeers(3, peers, CombineRoutingFilters(SelectAllPolicy, pb)), 1)
 }
+
+func TestSelectAllPeers(t *testing.T) {
+	a := common.NetworkMember{Endpoint: "a"}
+	b := common.NetworkMember{Endpoint: "b"}
+	c := common.NetworkMember{Endpoint: "c"}
+	d := common.NetworkMember{Endpoint: "d"}
+	e := common.NetworkMember{Endpoint: "e"}
+	f := common.NetworkMember{Endpoint: "f"}
+	g := common.NetworkMember{Endpoint: "g"}
+
+	peers := []common.NetworkMember{a, b, c, d, e, f, g}
+	filter := func(member common.NetworkMember) bool {
+		return member.Endpoint == "a" || member.Endpoint == "b" || member.Endpoint == "c" || member.Endpoint == "d"
+	}
+
+	assert.Len(t, SelectAllPeers(peers, filter), 4)
+}

gossip/channel_test.go

@@ -104,6 +104,59 @@ func TestCreateLeaveChainMessage(t *testing.T) {
 	assert.True(t, len(msg.Envelope.Signature) > 0)
 }
 
+func TestRemoveMemberWithChain(t *testing.T) {
+	gossipSvc1, err := CreateGossipServer([]string{"localhost:9058"}, "localhost:9058", 0)
+	require.NoError(t, err)
+	defer gossipSvc1.Stop()
+
+	gossipSvc2, err := CreateGossipServer([]string{"localhost:9058"}, "localhost:10058", 1)
+	require.NoError(t, err)
+	defer gossipSvc2.Stop()
+
+	mac := channel.GenerateMAC(gossipSvc1.SelfPKIid(), "channel3")
+	_, err = gossipSvc1.CreateChain(mac, "channel3", []common.FileSyncInfo{})
+	assert.NoError(t, err)
+
+	_, err = gossipSvc1.AddMemberToChain(mac, gossipSvc2.SelfPKIid())
+	assert.NoError(t, err)
+
+	time.Sleep(5 * time.Second)
+	chainState := gossipSvc2.SelfChainInfo("channel3")
+	assert.NotNil(t, chainState)
+
+	gossipSvc3, err := CreateGossipServer([]string{"localhost:9058"}, "localhost:8058", 2)
+	require.NoError(t, err)
+	defer gossipSvc3.Stop()
+
+	_, err = gossipSvc1.AddMemberToChain(mac, gossipSvc3.SelfPKIid())
+	assert.NoError(t, err)
+
+	time.Sleep(5 * time.Second)
+	chainState = gossipSvc3.SelfChainInfo("channel3")
+	assert.NotNil(t, chainState)
+
+	chainState, err = gossipSvc1.RemoveMemberWithChain(mac, []byte{0})
+	assert.NoError(t, err)
+	chainInfo, err := chainState.GetChainStateInfo()
+	assert.NoError(t, err)
+	assert.Len(t, chainInfo.Properties.Members, 3)
+
+	_, err = gossipSvc2.RemoveMemberWithChain(mac, gossipSvc3.SelfPKIid())
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed verifying ChainStateInfo message")
+
+	chainState, err = gossipSvc1.RemoveMemberWithChain(mac, gossipSvc3.SelfPKIid())
+	assert.NoError(t, err)
+	chainInfo, err = chainState.GetChainStateInfo()
+	assert.NoError(t, err)
+	assert.Len(t, chainInfo.Properties.Members, 2)
+
+	time.Sleep(5 * time.Second)
+
+	chainState = gossipSvc3.SelfChainInfo("channel3")
+	assert.Nil(t, chainState)
+}
+
 func secureDialOpts() []grpc.DialOption {
 	var dialOpts []grpc.DialOption
 	dialOpts = append(dialOpts, grpc.WithDefaultCallOptions(

gossip/chanstate.go

@@ -38,6 +38,8 @@ type channelState struct {
 }
 
 func (cs *channelState) stop() {
+	logging.Info("Stopping channelState")
+	defer logging.Info("Stopped channelState")
 	if cs.isStopping() {
 		return
 	}

rpc/rpc.go

@@ -379,8 +379,8 @@ func (s *Server) Stop() {
 	if !atomic.CompareAndSwapInt32(&s.stopping, int32(0), int32(1)) {
 		return
 	}
-	logging.Info("Stopping")
-	defer logging.Info("Stopped")
+	logging.Info("Stopping rpc")
+	defer logging.Info("Stopped rpc")
 	if s.gSrv != nil {
 		s.gSrv.Stop()
 	}