Commit 7e6c1f80 authored by Bas van Kervel's avatar Bas van Kervel Committed by Jeffrey Wilcke

corrected input formatters as suggested during review

parent ceb0739b
...@@ -34,7 +34,7 @@ web3._extend({ ...@@ -34,7 +34,7 @@ web3._extend({
name: 'verbosity', name: 'verbosity',
call: 'admin_verbosity', call: 'admin_verbosity',
params: 1, params: 1,
inputFormatter: [web3._extend.utils.toDecimal] inputFormatter: [web3._extend.utils.fromDecimal]
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'setSolc', name: 'setSolc',
...@@ -46,7 +46,7 @@ web3._extend({ ...@@ -46,7 +46,7 @@ web3._extend({
name: 'startRPC', name: 'startRPC',
call: 'admin_startRPC', call: 'admin_startRPC',
params: 4, params: 4,
inputFormatter: [null, web3._extend.utils.toDecimal, null, null] inputFormatter: [null, null, null, null]
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'stopRPC', name: 'stopRPC',
......
...@@ -18,7 +18,7 @@ web3._extend({ ...@@ -18,7 +18,7 @@ web3._extend({
name: 'resend', name: 'resend',
call: 'eth_resend', call: 'eth_resend',
params: 3, params: 3,
inputFormatter: [null, null, null] inputFormatter: [web3._extend.formatters.inputTransactionFormatter, web3._extend.utils.fromDecimal, web3._extend.utils.fromDecimal]
}) })
], ],
properties: properties:
......
...@@ -27,7 +27,7 @@ web3._extend({ ...@@ -27,7 +27,7 @@ web3._extend({
name: 'setGasPrice', name: 'setGasPrice',
call: 'miner_setGasPrice', call: 'miner_setGasPrice',
params: 1, params: 1,
inputFormatter: [null] inputFormatter: [web3._extend.utils.fromDecial]
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'startAutoDAG', name: 'startAutoDAG',
......
...@@ -14,10 +14,8 @@ const ( ...@@ -14,10 +14,8 @@ const (
var ( var (
// mapping between methods and handlers // mapping between methods and handlers
netMapping = map[string]nethandler{ netMapping = map[string]nethandler{
"net_version": (*netApi).Version,
"net_peerCount": (*netApi).PeerCount, "net_peerCount": (*netApi).PeerCount,
"net_listening": (*netApi).IsListening, "net_listening": (*netApi).IsListening,
"net_peers": (*netApi).Peers,
} }
) )
...@@ -70,11 +68,6 @@ func (self *netApi) ApiVersion() string { ...@@ -70,11 +68,6 @@ func (self *netApi) ApiVersion() string {
return NetApiVersion return NetApiVersion
} }
// Network version
func (self *netApi) Version(req *shared.Request) (interface{}, error) {
return self.xeth.NetworkVersion(), nil
}
// Number of connected peers // Number of connected peers
func (self *netApi) PeerCount(req *shared.Request) (interface{}, error) { func (self *netApi) PeerCount(req *shared.Request) (interface{}, error) {
return newHexNum(self.xeth.PeerCount()), nil return newHexNum(self.xeth.PeerCount()), nil
...@@ -84,6 +77,3 @@ func (self *netApi) IsListening(req *shared.Request) (interface{}, error) { ...@@ -84,6 +77,3 @@ func (self *netApi) IsListening(req *shared.Request) (interface{}, error) {
return self.xeth.IsListening(), nil return self.xeth.IsListening(), nil
} }
func (self *netApi) Peers(req *shared.Request) (interface{}, error) {
return self.ethereum.PeersInfo(), nil
}
...@@ -14,14 +14,6 @@ web3._extend({ ...@@ -14,14 +14,6 @@ web3._extend({
], ],
properties: properties:
[ [
new web3._extend.Property({
name: 'peers',
getter: 'net_peers'
}),
new web3._extend.Property({
name: 'version',
getter: 'net_version'
})
] ]
}); });
` `
...@@ -91,8 +91,6 @@ var ( ...@@ -91,8 +91,6 @@ var (
"net": []string{ "net": []string{
"peerCount", "peerCount",
"listening", "listening",
"version",
"peers",
}, },
"personal": []string{ "personal": []string{
"listAccounts", "listAccounts",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment