aboutsummaryrefslogtreecommitdiffstats
path: root/p2p
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-16 23:50:29 +0800
committerzelig <viktor.tron@gmail.com>2015-03-16 23:50:29 +0800
commitb3e133dd159749a625c4b0245af293607ba12c8c (patch)
tree9ba8e8c4afe9168f5bc83219d402efb00387d616 /p2p
parent8139d444f8d8163251d1c96ef8034d186825ce32 (diff)
parent73af0302bed5076260ac935e452064aee423934d (diff)
downloaddexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst
dexon-b3e133dd159749a625c4b0245af293607ba12c8c.zip
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'p2p')
-rw-r--r--p2p/message.go4
-rw-r--r--p2p/server.go6
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 4d1437d80..9c148ba39 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()