fmt code

plugin/p2p/gossip/common.go

@@ -30,30 +30,30 @@ var P2pComm Comm
 type Comm struct{}
 
 //CheckNetAddr check addr or ip  format
-func (Comm) CheckNetAddr(addr string) ( string, int64, error) {
+func (Comm) CheckNetAddr(addr string) (string, int64, error) {
 	//check peerAddr
 	if !strings.Contains(addr, ":") { //only ip
 		if net.ParseIP(addr) == nil {
-			return "", 0,errors.New("invalid ip")
+			return "", 0, errors.New("invalid ip")
 		}
-		return addr,0,nil
+		return addr, 0, nil
 	}
 
 	host, port, err := net.SplitHostPort(addr)
 	if err != nil {
-		return "",0, err
+		return "", 0, err
 	}
 
 	iport, err := strconv.ParseInt(port, 10, 32)
 	if err != nil || iport > 65535 {
-		return "",0,errors.New("invalid port")
+		return "", 0, errors.New("invalid port")
 	}
 
 	if net.ParseIP(host) == nil {
-		return "",0,errors.New("invalid ip")
+		return "", 0, errors.New("invalid ip")
 	}
 
-	return host,iport ,nil
+	return host, iport, nil
 
 }
 

plugin/p2p/gossip/const.go

@@ -25,7 +25,6 @@ var (
 	CheckActivePeersInterVal    = 5 * time.Second
 	CheckBlackListInterVal      = 30 * time.Second
 	CheckCfgSeedsInterVal       = 1 * time.Minute
-
 )
 
 const (

plugin/p2p/gossip/p2p_test.go

@@ -172,7 +172,6 @@ func testP2PEvent(t *testing.T, p2p *P2p) {
 	msgs = append(msgs, p2p.client.NewMessage("p2p", types.EventDelBlacklist, &types.BlackPeer{PeerAddr: "192.168.1.1:13802"}))
 	msgs = append(msgs, p2p.client.NewMessage("p2p", types.EventShowBlacklist, &types.ReqNil{}))
 
-
 	for _, msg := range msgs {
 		p2p.mgr.PubSub.Pub(msg, P2PTypeName)
 	}
@@ -494,42 +493,42 @@ func TestBytesToInt32(t *testing.T) {
 }
 
 func TestComm_CheckNetAddr(t *testing.T) {
-	_,_, err:= P2pComm.CheckNetAddr("192.16666.0.1")
+	_, _, err := P2pComm.CheckNetAddr("192.16666.0.1")
 	assert.NotNil(t, err)
-	assert.Equal(t, "invalid ip",err.Error())
-	_,_, err = P2pComm.CheckNetAddr("192.169.0.1:899999")
+	assert.Equal(t, "invalid ip", err.Error())
+	_, _, err = P2pComm.CheckNetAddr("192.169.0.1:899999")
 	assert.NotNil(t, err)
-	assert.Equal(t, "invalid port",err.Error())
-	_,_, err = P2pComm.CheckNetAddr("192.169.257.1:899")
+	assert.Equal(t, "invalid port", err.Error())
+	_, _, err = P2pComm.CheckNetAddr("192.169.257.1:899")
 	assert.NotNil(t, err)
-	assert.Equal(t, "invalid ip",err.Error())
-	_,_, err = P2pComm.CheckNetAddr("192.169.1.1")
+	assert.Equal(t, "invalid ip", err.Error())
+	_, _, err = P2pComm.CheckNetAddr("192.169.1.1")
 	assert.Nil(t, err)
-	_,_, err = P2pComm.CheckNetAddr("192.169.1.1:123")
+	_, _, err = P2pComm.CheckNetAddr("192.169.1.1:123")
 	assert.Nil(t, err)
 
 }
 
 func TestBlackList_Add(t *testing.T) {
-	bl:=	&BlackList{badPeers: make(map[string]int64)}
-	bl.Add("192.168.1.1:13802",3600)
+	bl := &BlackList{badPeers: make(map[string]int64)}
+	bl.Add("192.168.1.1:13802", 3600)
 	assert.True(t, bl.Has("192.168.1.1:13802"))
-	pid:="0306c47d6b4e2abbacbf2285b083a1218b89ec70092ed0f0232577d111e9d94d6c"
-	bl.addPeerStore(pid,"192.168.1.1:13802")
-	_,ok:= bl.getpeerStore(pid)
+	pid := "0306c47d6b4e2abbacbf2285b083a1218b89ec70092ed0f0232577d111e9d94d6c"
+	bl.addPeerStore(pid, "192.168.1.1:13802")
+	_, ok := bl.getpeerStore(pid)
 	assert.True(t, ok)
 }
 
 func TestBlackList_Delete(t *testing.T) {
-	bl:=	&BlackList{badPeers: make(map[string]int64)}
-	bl.Add("192.168.1.1:13802",3600)
-	pid:="0306c47d6b4e2abbacbf2285b083a1218b89ec70092ed0f0232577d111e9d94d6c"
-	bl.addPeerStore(pid,"192.168.1.1:13802")
+	bl := &BlackList{badPeers: make(map[string]int64)}
+	bl.Add("192.168.1.1:13802", 3600)
+	pid := "0306c47d6b4e2abbacbf2285b083a1218b89ec70092ed0f0232577d111e9d94d6c"
+	bl.addPeerStore(pid, "192.168.1.1:13802")
 	bl.Delete("192.168.2.1")
 	assert.True(t, bl.Has("192.168.1.1:13802"))
-	assert.Equal(t, 1,len(bl.GetBadPeers()))
+	assert.Equal(t, 1, len(bl.GetBadPeers()))
 	bl.Delete("192.168.1.1:13802")
-	assert.Equal(t, 0,len(bl.GetBadPeers()))
+	assert.Equal(t, 0, len(bl.GetBadPeers()))
 	bl.deletePeerStore(pid)
 }
 

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.CheckNetAddr(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.CheckNetAddr(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.CheckNetAddr(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.CheckNetAddr(remoteAddr)
 			m.network.node.nodeInfo.blacklist.Delete(ip)
 			m.network.node.nodeInfo.blacklist.Delete(remoteAddr)
 			m.network.node.nodeInfo.blacklist.deletePeerStore(remoteAddr)