rename func

plugin/p2p/gossip/common.go

@@ -30,7 +30,7 @@ var P2pComm Comm
 type Comm struct{}
 
 //CheckNetAddr check addr or ip  format
-func (Comm) CheckNetAddr(addr string) (string, int64, error) {
+func (Comm) ParaseNetAddr(addr string) (string, int64, error) {
 	//check peerAddr
 	if !strings.Contains(addr, ":") { //only ip
 		if net.ParseIP(addr) == nil {

plugin/p2p/gossip/p2p_test.go

@@ -493,18 +493,18 @@ func TestBytesToInt32(t *testing.T) {
 }
 
 func TestComm_CheckNetAddr(t *testing.T) {
-	_, _, err := P2pComm.CheckNetAddr("192.16666.0.1")
+	_, _, err := P2pComm.ParaseNetAddr("192.16666.0.1")
 	assert.NotNil(t, err)
 	assert.Equal(t, "invalid ip", err.Error())
-	_, _, err = P2pComm.CheckNetAddr("192.169.0.1:899999")
+	_, _, err = P2pComm.ParaseNetAddr("192.169.0.1:899999")
 	assert.NotNil(t, err)
 	assert.Equal(t, "invalid port", err.Error())
-	_, _, err = P2pComm.CheckNetAddr("192.169.257.1:899")
+	_, _, err = P2pComm.ParaseNetAddr("192.169.257.1:899")
 	assert.NotNil(t, err)
 	assert.Equal(t, "invalid ip", err.Error())
-	_, _, err = P2pComm.CheckNetAddr("192.169.1.1")
+	_, _, err = P2pComm.ParaseNetAddr("192.169.1.1")
 	assert.Nil(t, err)
-	_, _, err = P2pComm.CheckNetAddr("192.169.1.1:123")
+	_, _, err = P2pComm.ParaseNetAddr("192.169.1.1:123")
 	assert.Nil(t, err)
 
 }

plugin/p2p/gossip/p2pcli.go

@@ -675,7 +675,7 @@ func (m *Cli) AddPeerToBlacklist(msg *queue.Message, taskindex int64) {
 
 	if blackPeer.PeerAddr != "" { //把IP或者IP:PORT加入 黑名单
 		//check peerAddr
-		ip, _, err := P2pComm.CheckNetAddr(blackPeer.GetPeerAddr())
+		ip, _, err := P2pComm.ParaseNetAddr(blackPeer.GetPeerAddr())
 		if err != nil {
 			msg.Reply(m.network.client.NewMessage("rpc", pb.EventReply, &pb.Reply{IsOk: false, Msg: []byte(err.Error())}))
 			return
@@ -691,7 +691,7 @@ func (m *Cli) AddPeerToBlacklist(msg *queue.Message, taskindex int64) {
 	} else if blackPeer.PeerName != "" {
 		peer := m.network.node.GetRegisterPeer(blackPeer.PeerName)
 		if peer != nil {
-			ip, _, _ := P2pComm.CheckNetAddr(peer.Addr())
+			ip, _, _ := P2pComm.ParaseNetAddr(peer.Addr())
 			m.network.node.nodeInfo.blacklist.Add(ip, int64(lifetime.Seconds()))
 			m.network.node.nodeInfo.blacklist.Add(peer.Addr(), int64(lifetime.Seconds()))
 
@@ -719,7 +719,7 @@ func (m *Cli) DelPeerFromBlacklist(msg *queue.Message, taskindex int64) {
 	blackPeer := msg.GetData().(*pb.BlackPeer)
 	if blackPeer.PeerAddr != "" {
 		//check peerAddr
-		ip, _, err := P2pComm.CheckNetAddr(blackPeer.GetPeerAddr())
+		ip, _, err := P2pComm.ParaseNetAddr(blackPeer.GetPeerAddr())
 		if err != nil {
 			msg.Reply(m.network.client.NewMessage("rpc", pb.EventReply, &pb.Reply{IsOk: false, Msg: []byte(err.Error())}))
 			return
@@ -731,7 +731,7 @@ func (m *Cli) DelPeerFromBlacklist(msg *queue.Message, taskindex int64) {
 		//通过pid 获取remoteAddr
 		remoteAddr, ok := m.network.node.nodeInfo.blacklist.getpeerStore(blackPeer.PeerName)
 		if ok {
-			ip, _, _ := P2pComm.CheckNetAddr(remoteAddr)
+			ip, _, _ := P2pComm.ParaseNetAddr(remoteAddr)
 			m.network.node.nodeInfo.blacklist.Delete(ip)
 			m.network.node.nodeInfo.blacklist.Delete(remoteAddr)
 			m.network.node.nodeInfo.blacklist.deletePeerStore(remoteAddr)