diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-11-04 18:59:31 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-11-04 18:59:31 +0800 |
| commit | e165c2d23cf29fdec51c59f42f74735be2a8e1ff (patch) | |
| tree | 375a6b3870c6b4f791c79128a4d7b29015b64851 /rpc | |
| parent | dda3bf3ce7ef109541adb6f0020f8d2dd28e5e51 (diff) | |
| parent | e46ab3bdcde7236c8fe54d6c83655e50bd19fe31 (diff) | |
| download | dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar.gz dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar.bz2 dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar.lz dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar.xz dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.tar.zst dexon-e165c2d23cf29fdec51c59f42f74735be2a8e1ff.zip | |
Merge pull request #1934 from karalabe/polish-protocol-infos
eth, p2p, rpc/api: polish protocol info gathering
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/api/admin.go | 9 | ||||
| -rw-r--r-- | rpc/api/utils.go | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/rpc/api/admin.go b/rpc/api/admin.go index eb08fbc5d..b359d52a1 100644 --- a/rpc/api/admin.go +++ b/rpc/api/admin.go @@ -32,6 +32,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/comms" @@ -80,15 +81,17 @@ type adminhandler func(*adminApi, *shared.Request) (interface{}, error) // admin api provider type adminApi struct { xeth *xeth.XEth + network *p2p.Server ethereum *eth.Ethereum codec codec.Codec coder codec.ApiCoder } // create a new admin api instance -func NewAdminApi(xeth *xeth.XEth, ethereum *eth.Ethereum, codec codec.Codec) *adminApi { +func NewAdminApi(xeth *xeth.XEth, network *p2p.Server, ethereum *eth.Ethereum, codec codec.Codec) *adminApi { return &adminApi{ xeth: xeth, + network: network, ethereum: ethereum, codec: codec, coder: codec.New(nil), @@ -137,11 +140,11 @@ func (self *adminApi) AddPeer(req *shared.Request) (interface{}, error) { } func (self *adminApi) Peers(req *shared.Request) (interface{}, error) { - return self.ethereum.PeersInfo(), nil + return self.network.PeersInfo(), nil } func (self *adminApi) NodeInfo(req *shared.Request) (interface{}, error) { - return self.ethereum.NodeInfo(), nil + return self.network.NodeInfo(), nil } func (self *adminApi) DataDir(req *shared.Request) (interface{}, error) { diff --git a/rpc/api/utils.go b/rpc/api/utils.go index 5a3ade46b..6dde4022b 100644 --- a/rpc/api/utils.go +++ b/rpc/api/utils.go @@ -165,7 +165,7 @@ func ParseApiString(apistr string, codec codec.Codec, xeth *xeth.XEth, eth *eth. for i, name := range names { switch strings.ToLower(strings.TrimSpace(name)) { case shared.AdminApiName: - apis[i] = NewAdminApi(xeth, eth, codec) + apis[i] = NewAdminApi(xeth, eth.Network(), eth, codec) case shared.DebugApiName: apis[i] = NewDebugApi(xeth, eth, codec) case shared.DbApiName: |