Merge "[FAB-3636] Check the error, associating id to cert"

hyperledger · May 4, 2017 · f2e94b3 · f2e94b3
2 parents 8fbd4ea + c7d93ff
commit f2e94b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
@@ -99,7 +99,9 @@ func NewCommInstanceWithServer(port int, idMapper identity.Mapper, peerIdentity
 		subscriptions:  make([]chan proto.ReceivedMessage, 0),
 	}
 	commInst.connStore = newConnStore(commInst, commInst.logger)
-	commInst.idMapper.Put(idMapper.GetPKIidOfCert(peerIdentity), peerIdentity)
+	if err := commInst.idMapper.Put(idMapper.GetPKIidOfCert(peerIdentity), peerIdentity); err != nil {
+		commInst.logger.Panic("Failed associating self PKIID to cert:", err)
+	}
 
 	if port > 0 {
 		commInst.stopWG.Add(1)

diff --git a/gossip/service/gossip_service.go b/gossip/service/gossip_service.go
@@ -142,7 +142,9 @@ func InitGossipServiceCustomDeliveryFactory(peerIdentity []byte, endpoint string
 		logger.Info("Initialize gossip with endpoint", endpoint, "and bootstrap set", bootPeers)
 
 		idMapper := identity.NewIdentityMapper(mcs)
-		idMapper.Put(mcs.GetPKIidOfCert(peerIdentity), peerIdentity)
+		if err := idMapper.Put(mcs.GetPKIidOfCert(peerIdentity), peerIdentity); err != nil {
+			logger.Panic("Failed associating self PKIID to cert:", err)
+		}
 
 		gossip := integration.NewGossipComponent(peerIdentity, endpoint, s, secAdv,
 			mcs, idMapper, secureDialOpts, bootPeers...)