From d2a87f6f72b1582fd6e220e2a00d7c3f5a6df335 Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Mon, 8 Jun 2015 14:50:11 +0200 Subject: added net API --- rpc/api/net.go | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 rpc/api/net.go (limited to 'rpc/api/net.go') diff --git a/rpc/api/net.go b/rpc/api/net.go new file mode 100644 index 000000000..6799d68f6 --- /dev/null +++ b/rpc/api/net.go @@ -0,0 +1,81 @@ +package api + +import ( + "github.com/ethereum/go-ethereum/eth" + "github.com/ethereum/go-ethereum/rpc/codec" + "github.com/ethereum/go-ethereum/rpc/shared" + "github.com/ethereum/go-ethereum/xeth" +) + +var ( + // mapping between methods and handlers + netMapping = map[string]nethandler{ + "net_id": (*net).NetworkVersion, + "net_peerCount": (*net).PeerCount, + "net_listening": (*net).IsListening, + "net_peers": (*net).Peers, + } +) + +// net callback handler +type nethandler func(*net, *shared.Request) (interface{}, error) + +// net api provider +type net struct { + xeth *xeth.XEth + ethereum *eth.Ethereum + methods map[string]nethandler + codec codec.ApiCoder +} + +// create a new net api instance +func NewNetApi(xeth *xeth.XEth, eth *eth.Ethereum, coder codec.Codec) *net { + return &net{ + xeth: xeth, + ethereum: eth, + methods: netMapping, + codec: coder.New(nil), + } +} + +// collection with supported methods +func (self *net) Methods() []string { + methods := make([]string, len(self.methods)) + i := 0 + for k := range self.methods { + methods[i] = k + i++ + } + return methods +} + +// Execute given request +func (self *net) Execute(req *shared.Request) (interface{}, error) { + if callback, ok := self.methods[req.Method]; ok { + return callback(self, req) + } + + return nil, shared.NewNotImplementedError(req.Method) +} + +func (self *net) Name() string { + return NetApiName +} + +// Network version +func (self *net) NetworkVersion(req *shared.Request) (interface{}, error) { + return self.xeth.NetworkVersion(), nil +} + +// Number of connected peers +func (self *net) PeerCount(req *shared.Request) (interface{}, error) { + return self.xeth.PeerCount(), nil +} + +func (self *net) IsListening(req *shared.Request) (interface{}, error) { + return self.xeth.IsListening(), nil +} + +func (self *net) Peers(req *shared.Request) (interface{}, error) { + return self.ethereum.PeersInfo(), nil +} -- cgit v1.2.3 From cc9ae399338557b6671e8fc83bb696c5ddb068fe Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Tue, 9 Jun 2015 16:06:51 +0200 Subject: added admin API --- rpc/api/net.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'rpc/api/net.go') diff --git a/rpc/api/net.go b/rpc/api/net.go index 6799d68f6..efc400785 100644 --- a/rpc/api/net.go +++ b/rpc/api/net.go @@ -10,18 +10,18 @@ import ( var ( // mapping between methods and handlers netMapping = map[string]nethandler{ - "net_id": (*net).NetworkVersion, - "net_peerCount": (*net).PeerCount, - "net_listening": (*net).IsListening, - "net_peers": (*net).Peers, + "net_id": (*netApi).NetworkVersion, + "net_peerCount": (*netApi).PeerCount, + "net_listening": (*netApi).IsListening, + "net_peers": (*netApi).Peers, } ) // net callback handler -type nethandler func(*net, *shared.Request) (interface{}, error) +type nethandler func(*netApi, *shared.Request) (interface{}, error) // net api provider -type net struct { +type netApi struct { xeth *xeth.XEth ethereum *eth.Ethereum methods map[string]nethandler @@ -29,8 +29,8 @@ type net struct { } // create a new net api instance -func NewNetApi(xeth *xeth.XEth, eth *eth.Ethereum, coder codec.Codec) *net { - return &net{ +func NewNetApi(xeth *xeth.XEth, eth *eth.Ethereum, coder codec.Codec) *netApi { + return &netApi{ xeth: xeth, ethereum: eth, methods: netMapping, @@ -39,7 +39,7 @@ func NewNetApi(xeth *xeth.XEth, eth *eth.Ethereum, coder codec.Codec) *net { } // collection with supported methods -func (self *net) Methods() []string { +func (self *netApi) Methods() []string { methods := make([]string, len(self.methods)) i := 0 for k := range self.methods { @@ -50,7 +50,7 @@ func (self *net) Methods() []string { } // Execute given request -func (self *net) Execute(req *shared.Request) (interface{}, error) { +func (self *netApi) Execute(req *shared.Request) (interface{}, error) { if callback, ok := self.methods[req.Method]; ok { return callback(self, req) } @@ -58,24 +58,24 @@ func (self *net) Execute(req *shared.Request) (interface{}, error) { return nil, shared.NewNotImplementedError(req.Method) } -func (self *net) Name() string { +func (self *netApi) Name() string { return NetApiName } // Network version -func (self *net) NetworkVersion(req *shared.Request) (interface{}, error) { +func (self *netApi) NetworkVersion(req *shared.Request) (interface{}, error) { return self.xeth.NetworkVersion(), nil } // Number of connected peers -func (self *net) PeerCount(req *shared.Request) (interface{}, error) { +func (self *netApi) PeerCount(req *shared.Request) (interface{}, error) { return self.xeth.PeerCount(), nil } -func (self *net) IsListening(req *shared.Request) (interface{}, error) { +func (self *netApi) IsListening(req *shared.Request) (interface{}, error) { return self.xeth.IsListening(), nil } -func (self *net) Peers(req *shared.Request) (interface{}, error) { +func (self *netApi) Peers(req *shared.Request) (interface{}, error) { return self.ethereum.PeersInfo(), nil } -- cgit v1.2.3 From bd38428f33b127e9c60d26127695e50c55798fcd Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Wed, 10 Jun 2015 11:29:52 +0200 Subject: cleanup of javascript API --- rpc/api/net.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/api/net.go') diff --git a/rpc/api/net.go b/rpc/api/net.go index efc400785..6f5d55f12 100644 --- a/rpc/api/net.go +++ b/rpc/api/net.go @@ -10,7 +10,7 @@ import ( var ( // mapping between methods and handlers netMapping = map[string]nethandler{ - "net_id": (*netApi).NetworkVersion, + "net_version": (*netApi).Version, "net_peerCount": (*netApi).PeerCount, "net_listening": (*netApi).IsListening, "net_peers": (*netApi).Peers, @@ -63,7 +63,7 @@ func (self *netApi) Name() string { } // Network version -func (self *netApi) NetworkVersion(req *shared.Request) (interface{}, error) { +func (self *netApi) Version(req *shared.Request) (interface{}, error) { return self.xeth.NetworkVersion(), nil } -- cgit v1.2.3 From 1fe617fa5791bffb6b3cc60636c6629c7aca36d3 Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Mon, 8 Jun 2015 14:50:11 +0200 Subject: added net API --- rpc/api/net.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'rpc/api/net.go') diff --git a/rpc/api/net.go b/rpc/api/net.go index 6f5d55f12..d6888ee4a 100644 --- a/rpc/api/net.go +++ b/rpc/api/net.go @@ -7,6 +7,10 @@ import ( "github.com/ethereum/go-ethereum/xeth" ) +const ( + NetApiVersion = "1.0" +) + var ( // mapping between methods and handlers netMapping = map[string]nethandler{ @@ -62,6 +66,10 @@ func (self *netApi) Name() string { return NetApiName } +func (self *netApi) ApiVersion() string { + return NetApiVersion +} + // Network version func (self *netApi) Version(req *shared.Request) (interface{}, error) { return self.xeth.NetworkVersion(), nil -- cgit v1.2.3