diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-16 18:27:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-16 18:27:38 +0800 |
| commit | b5234413611ce5984292f85a01de1f56c045b490 (patch) | |
| tree | e6e0c6f7fe8358a2dc63cdea11ac66b4f59397f5 /p2p | |
| parent | 0b8f66ed9ef177dc72442dd7ba337c6733e30344 (diff) | |
| download | go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar.gz go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar.bz2 go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar.lz go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar.xz go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.tar.zst go-tangerine-b5234413611ce5984292f85a01de1f56c045b490.zip | |
Moved ethutil => common
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/message.go | 4 | ||||
| -rw-r--r-- | p2p/server.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/p2p/message.go b/p2p/message.go index f88c31d1d..14e4404c9 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/rlp" ) @@ -30,7 +30,7 @@ type Msg struct { // NewMsg creates an RLP-encoded message with the given code. func NewMsg(code uint64, params ...interface{}) Msg { - p := bytes.NewReader(ethutil.Encode(params)) + p := bytes.NewReader(common.Encode(params)) return Msg{Code: code, Size: uint32(p.Len()), Payload: p} } diff --git a/p2p/server.go b/p2p/server.go index 9762fcc6d..02f1b8572 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/nat" @@ -46,7 +46,7 @@ type Server struct { MaxPeers int // Name sets the node name of this server. - // Use ethutil.MakeName to create a name that follows existing conventions. + // Use common.MakeName to create a name that follows existing conventions. Name string // Bootstrap nodes are used to establish connectivity @@ -132,7 +132,7 @@ func (srv *Server) SuggestPeer(n *discover.Node) { func (srv *Server) Broadcast(protocol string, code uint64, data ...interface{}) { var payload []byte if data != nil { - payload = ethutil.Encode(data) + payload = common.Encode(data) } srv.lock.RLock() defer srv.lock.RUnlock() |