From ceb0739ba111215d47cc2ff9d80d542fa26d764a Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Mon, 6 Jul 2015 13:08:08 +0200 Subject: fixed web3 formatters mismatch --- rpc/api/net_js.go | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'rpc/api/net_js.go') diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go index 1677d9fa6..cc8d7f46e 100644 --- a/rpc/api/net_js.go +++ b/rpc/api/net_js.go @@ -2,45 +2,25 @@ package api const Net_JS = ` web3._extend({ - property: 'network', + property: 'net', methods: [ new web3._extend.Method({ name: 'addPeer', call: 'net_addPeer', params: 1, - inputFormatter: [web3._extend.utils.formatInputString], - outputFormatter: web3._extend.formatters.formatOutputBool - }), - new web3._extend.Method({ - name: 'getPeerCount', - call: 'net_peerCount', - params: 0, - inputFormatter: [], - outputFormatter: web3._extend.formatters.formatOutputString + inputFormatter: [null] }) ], properties: [ - new web3._extend.Property({ - name: 'listening', - getter: 'net_listening', - outputFormatter: web3._extend.formatters.formatOutputBool - }), - new web3._extend.Property({ - name: 'peerCount', - getter: 'net_peerCount', - outputFormatter: web3._extend.utils.toDecimal - }), new web3._extend.Property({ name: 'peers', - getter: 'net_peers', - outputFormatter: function(obj) { return obj; } + getter: 'net_peers' }), new web3._extend.Property({ name: 'version', - getter: 'net_version', - outputFormatter: web3._extend.formatters.formatOutputString + getter: 'net_version' }) ] }); -- cgit v1.2.3 From 7e6c1f8024d0cc0f381c615cab3c97b57fc9515e Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Mon, 6 Jul 2015 15:59:36 +0200 Subject: corrected input formatters as suggested during review --- rpc/api/net_js.go | 8 -------- 1 file changed, 8 deletions(-) (limited to 'rpc/api/net_js.go') diff --git a/rpc/api/net_js.go b/rpc/api/net_js.go index cc8d7f46e..2f872393c 100644 --- a/rpc/api/net_js.go +++ b/rpc/api/net_js.go @@ -14,14 +14,6 @@ web3._extend({ ], properties: [ - new web3._extend.Property({ - name: 'peers', - getter: 'net_peers' - }), - new web3._extend.Property({ - name: 'version', - getter: 'net_version' - }) ] }); ` -- cgit v1.2.3