Skip to content

Commit

Permalink
p2pserver: replace package name and log
Browse files Browse the repository at this point in the history
  • Loading branch information
@dylenfu
dylenfu committed May 9, 2020
1 parent 030005b commit 57cf247
Show file tree
Hide file tree
Showing 59 changed files with 289 additions and 292 deletions.
10 changes: 5 additions & 5 deletions common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,23 @@ import (
var sdk = gosdk.NewOntologySdk()

func Initialize() {
sdk.NewRpcClient().SetAddress(config.DefConfig.JsonRpcAddress)
sdk.NewRpcClient().SetAddress(config.DefConfig.Sdk.JsonRpcAddress)
}

func GetAccountByPassword(path string) (*gosdk.Account, bool) {
wallet, err := sdk.OpenWallet(path)
if err != nil {
log4.Error("open wallet error:", err)
log4.Logf(log4.ERROR, "open wallet error:", err)
return nil, false
}
pwd, err := password.GetPassword()
if err != nil {
log4.Error("getPassword error:", err)
log4.Logf(log4.ERROR, "getPassword error:", err)
return nil, false
}
user, err := wallet.GetDefaultAccount(pwd)
if err != nil {
log4.Error("getDefaultAccount error:", err)
log4.Logf(log4.ERROR, "getDefaultAccount error:", err)
return nil, false
}
return user, true
Expand Down Expand Up @@ -86,7 +86,7 @@ func InvokeNativeContractWithMultiSign(
func WaitForBlock(sdk *gosdk.OntologySdk) bool {
_, err := sdk.WaitForGenerateBlock(30*time.Second, 1)
if err != nil {
log4.Error("WaitForGenerateBlock error:", err)
log4.Logf(log4.ERROR, "WaitForGenerateBlock error:", err)
return false
}
return true
Expand Down
14 changes: 7 additions & 7 deletions methods/net_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"fmt"
log4 "github.com/alecthomas/log4go"
"github.com/ontio/ontology-tool/config"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/connect_controller"
"github.com/ontio/ontology-tool/p2pserver/message/types"
netsvr "github.com/ontio/ontology-tool/p2pserver/net/netserver"
commCfg "github.com/ontio/ontology/common/config"
"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/connect_controller"
"github.com/ontio/ontology/p2pserver/message/types"
netsvr "github.com/ontio/ontology/p2pserver/net/netserver"
// "github.com/ontio/ontology/p2pserver/net/protocol"
"github.com/ontio/ontology/p2pserver/peer"
// "github.com/ontio/ontology-tool/p2pserver/net/protocol"
"github.com/ontio/ontology-tool/p2pserver/peer"
"net"
"time"
)
Expand Down Expand Up @@ -88,7 +88,7 @@ func (s *NetServer) init(conf *commCfg.P2PNodeConfig, version string) error {
return fmt.Errorf("[p2p]failed to create sync listener")
}

log4.Info("[p2p]init peer ID to ", s.base.Id.ToHexString())
log4.Info("[p2p]init peer ID to %s", s.base.Id.ToHexString())

return nil
}
Expand Down
22 changes: 11 additions & 11 deletions p2pserver/connect_controller/connect_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"sync"
"sync/atomic"

"github.com/ontio/ontology/common/log"
"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/handshake"
"github.com/ontio/ontology/p2pserver/peer"
log4 "github.com/alecthomas/log4go"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/handshake"
"github.com/ontio/ontology-tool/p2pserver/peer"
"github.com/scylladb/go-set/strset"
)

Expand Down Expand Up @@ -209,7 +209,7 @@ func (self *ConnectController) AcceptConnect(conn net.Conn) (*peer.PeerInfo, net

wrapped := self.savePeer(conn, peerInfo, INBOUND_INDEX)

log.Infof("inbound peer %s connected, %s", conn.RemoteAddr().String(), peerInfo)
log4.Info("inbound peer %s connected, %s", conn.RemoteAddr().String(), peerInfo)
return peerInfo, wrapped, nil
}

Expand Down Expand Up @@ -245,7 +245,7 @@ func (self *ConnectController) Connect(addr string) (*peer.PeerInfo, net.Conn, e

wrapped := self.savePeer(conn, peerInfo, OUTBOUND_INDEX)

log.Infof("outbound peer %s connected. %s", conn.RemoteAddr().String(), peerInfo)
log4.Info("outbound peer %s connected. %s", conn.RemoteAddr().String(), peerInfo)
return peerInfo, wrapped, nil
}

Expand Down Expand Up @@ -292,7 +292,7 @@ func (self *ConnectController) beforeHandshakeCheck(addr string, index int) erro
func (self *ConnectController) isHandWithSelf(remotePeer *peer.PeerInfo, remoteAddr string) error {
addrIp, err := common.ParseIPAddr(remoteAddr)
if err != nil {
log.Warn(err)
log4.Warn(err)
return err
}
nodeAddr := addrIp + ":" + strconv.Itoa(int(remotePeer.Port))
Expand Down Expand Up @@ -343,7 +343,7 @@ func (self *ConnectController) removePeer(conn *Conn) {

p := self.peers[conn.kid]
if p == nil || p.peer == nil {
log.Fatalf("connection %s not in controller", conn.kid.ToHexString())
log4.Crashf("connection %s not in controller", conn.kid.ToHexString())
} else if p.connectId == conn.connectId { // connection not replaced
delete(self.peers, conn.kid)
}
Expand All @@ -359,19 +359,19 @@ func (self *ConnectController) checkPeerIdAndIP(peer *peer.PeerInfo, addr string
ipOld, err := common.ParseIPAddr(oldPeer.addr)
if err != nil {
err := fmt.Errorf("[createPeer]exist peer ip format is wrong %s", oldPeer.addr)
log.Fatal(err)
log4.Crash(err)
return err
}
ipNew, err := common.ParseIPAddr(addr)
if err != nil {
err := fmt.Errorf("[createPeer]connecting peer ip format is wrong %s, close", addr)
log.Fatal(err)
log4.Crash(err)
return err
}

if ipNew != ipOld {
err := fmt.Errorf("[createPeer]same peer id from different addr: %s, %s close latest one", ipOld, ipNew)
log.Warn(err)
log4.Warn(err)
return err
}

Expand Down
6 changes: 3 additions & 3 deletions p2pserver/connect_controller/connect_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"testing"
"time"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/handshake"
"github.com/ontio/ontology/p2pserver/peer"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/handshake"
"github.com/ontio/ontology-tool/p2pserver/peer"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions p2pserver/connect_controller/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package connect_controller
import (
"net"

"github.com/ontio/ontology/common/log"
"github.com/ontio/ontology/p2pserver/common"
log4 "github.com/alecthomas/log4go"
"github.com/ontio/ontology-tool/p2pserver/common"
)

// Conn is a net.Conn wrapper to do some clean up when Close.
Expand All @@ -37,7 +37,7 @@ type Conn struct {
// Close overwrite net.Conn
// warning: this method will try to lock the controller, be carefull to avoid deadlock
func (self *Conn) Close() error {
log.Infof("closing connection: peer %s, address: %s", self.kid.ToHexString(), self.addr)
log4.Info("closing connection: peer %s, address: %s", self.kid.ToHexString(), self.addr)

self.controller.removePeer(self)

Expand Down
2 changes: 1 addition & 1 deletion p2pserver/connect_controller/transport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"strconv"
"time"

"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology/common/config"
"github.com/ontio/ontology/p2pserver/common"
)

type Dialer interface {
Expand Down
10 changes: 5 additions & 5 deletions p2pserver/dht/dht.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ package dht
import (
"time"

"github.com/ontio/ontology/common/log"
"github.com/ontio/ontology/p2pserver/common"
kb "github.com/ontio/ontology/p2pserver/dht/kbucket"
log4 "github.com/alecthomas/log4go"
"github.com/ontio/ontology-tool/p2pserver/common"
kb "github.com/ontio/ontology-tool/p2pserver/dht/kbucket"
)

// Pool size is the number of nodes used for group find/set RPC calls
Expand Down Expand Up @@ -55,11 +55,11 @@ func NewDHT(id common.PeerId) *DHT {
rt := kb.NewRoutingTable(bucketSize, id)

rt.PeerAdded = func(p common.PeerId) {
log.Debugf("dht: peer: %d added to dht", p)
log4.Debug("dht: peer: %d added to dht", p)
}

rt.PeerRemoved = func(p common.PeerId) {
log.Debugf("dht: peer: %d removed from dht", p)
log4.Debug("dht: peer: %d removed from dht", p)
}

return &DHT{
Expand Down
2 changes: 1 addition & 1 deletion p2pserver/dht/dht_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion p2pserver/dht/kbucket/bucket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"container/list"
"sync"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/common"
)

// Bucket holds a list of peers.
Expand Down
2 changes: 1 addition & 1 deletion p2pserver/dht/kbucket/sorting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"container/list"
"sort"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/common"
)

// A helper struct to sort peers by their distance to the local node
Expand Down
2 changes: 1 addition & 1 deletion p2pserver/dht/kbucket/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"sync"
"time"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/common"
)

var ErrPeerRejectedHighLatency = errors.New("peer rejected; latency too high")
Expand Down
2 changes: 1 addition & 1 deletion p2pserver/dht/kbucket/table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"testing"
"time"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/scylladb/go-set/strset"
"github.com/stretchr/testify/require"
)
Expand Down
6 changes: 3 additions & 3 deletions p2pserver/handshake/handshake.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"time"

"github.com/blang/semver"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/message/types"
"github.com/ontio/ontology-tool/p2pserver/peer"
common2 "github.com/ontio/ontology/common"
"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/message/types"
"github.com/ontio/ontology/p2pserver/peer"
)

var HANDSHAKE_DURATION = 10 * time.Second // handshake time can not exceed this duration, or will treat as attack.
Expand Down
6 changes: 3 additions & 3 deletions p2pserver/handshake/handshake_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"testing"
"time"

"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/message/types"
"github.com/ontio/ontology/p2pserver/peer"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/message/types"
"github.com/ontio/ontology-tool/p2pserver/peer"
"github.com/stretchr/testify/assert"
)

Expand Down
14 changes: 7 additions & 7 deletions p2pserver/link/link.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"net"
"time"

log4 "github.com/alecthomas/log4go"
"github.com/ontio/ontology-tool/p2pserver/common"
"github.com/ontio/ontology-tool/p2pserver/message/types"
comm "github.com/ontio/ontology/common"
"github.com/ontio/ontology/common/log"
"github.com/ontio/ontology/p2pserver/common"
"github.com/ontio/ontology/p2pserver/message/types"
)

//Link used to establish
Expand Down Expand Up @@ -109,15 +109,15 @@ func (this *Link) Rx() {
for {
msg, payloadSize, err := types.ReadMessage(reader)
if err != nil {
log.Infof("[p2p]error read from %s :%s", this.GetAddr(), err.Error())
log4.Info("[p2p]error read from %s :%s", this.GetAddr(), err.Error())
break
}

t := time.Now()
this.UpdateRXTime(t)

if !this.needSendMsg(msg) {
log.Debugf("skip handle msgType:%s from:%d", msg.CmdType(), this.id)
log4.Debug("skip handle msgType:%s from:%d", msg.CmdType(), this.id)
continue
}

Expand Down Expand Up @@ -155,7 +155,7 @@ func (this *Link) SendRaw(rawPacket []byte) error {
return errors.New("[p2p]tx link invalid")
}
nByteCnt := len(rawPacket)
log.Tracef("[p2p]TX buf length: %d\n", nByteCnt)
log4.Debug("[p2p]TX buf length: %d", nByteCnt)

nCount := nByteCnt / common.PER_SEND_LEN
if nCount == 0 {
Expand All @@ -164,7 +164,7 @@ func (this *Link) SendRaw(rawPacket []byte) error {
_ = conn.SetWriteDeadline(time.Now().Add(time.Duration(nCount*common.WRITE_DEADLINE) * time.Second))
_, err := conn.Write(rawPacket)
if err != nil {
log.Infof("[p2p] error sending messge to %s :%s", this.GetAddr(), err.Error())
log4.Info("[p2p] error sending messge to %s :%s", this.GetAddr(), err.Error())
this.CloseConn()
return err
}
Expand Down
7 changes: 2 additions & 5 deletions p2pserver/link/link_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ import (
"time"

"github.com/ontio/ontology-crypto/keypair"
"github.com/ontio/ontology-tool/p2pserver/common"
mt "github.com/ontio/ontology-tool/p2pserver/message/types"
"github.com/ontio/ontology/account"
comm "github.com/ontio/ontology/common"
"github.com/ontio/ontology/common/log"
ct "github.com/ontio/ontology/core/types"
"github.com/ontio/ontology/p2pserver/common"
mt "github.com/ontio/ontology/p2pserver/message/types"
)

var (
Expand All @@ -42,8 +41,6 @@ var (
)

func init() {
log.InitLog(log.InfoLog, log.Stdout)

cliLink = NewLink()
serverLink = NewLink()
id := common.PseudoPeerIdFromUint64(0x733936)
Expand Down
Loading

0 comments on commit 57cf247

Please sign in to comment.