From c038e443769a9e1da93d4dc7e67d41531daf0067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Andronache?= Date: Tue, 5 Mar 2019 23:14:24 +0000 Subject: [PATCH 1/2] update version() --- README.rst | 5 +++-- docs/rpc/methods/node.rst | 5 +++-- src/nano/rpc.py | 12 +++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 397ae41..dff3a98 100644 --- a/README.rst +++ b/README.rst @@ -63,8 +63,9 @@ for examples of usage. >>> rpc.version() { 'rpc_version': 1, - 'store_version': 10, - 'node_vendor': 'RaiBlocks 9.0' + 'store_version': 13, + 'protocol_version': 16, + 'node_vendor': 'Nano 18.0' } >>> rpc.peers() { diff --git a/docs/rpc/methods/node.rst b/docs/rpc/methods/node.rst index 00793b2..2ca563b 100644 --- a/docs/rpc/methods/node.rst +++ b/docs/rpc/methods/node.rst @@ -308,6 +308,7 @@ Returns the node's RPC version >>> rpc.version() { "rpc_version": 1, - "store_version": 10, - "node_vendor": "RaiBlocks 9.0" + "store_version": 13, + "protocol_version": 16, + "node_vendor": "Nano 18.0" } diff --git a/src/nano/rpc.py b/src/nano/rpc.py index bdd2ed3..af37604 100644 --- a/src/nano/rpc.py +++ b/src/nano/rpc.py @@ -30,8 +30,9 @@ class Client(object): >>> rpc.version() { 'rpc_version': 1, - 'store_version': 10, - 'node_vendor': 'RaiBlocks 9.0' + 'store_version': 13, + 'protocol_version': 16, + 'node_vendor': 'Nano 18.0' } """ @@ -3356,15 +3357,16 @@ def version(self): >>> rpc.version() { "rpc_version": 1, - "store_version": 10, - "node_vendor": "RaiBlocks 9.0" + "store_version": 13, + "protocol_version": 16, + "node_vendor": "Nano 18.0" } """ resp = self.call('version') - for key in ('rpc_version', 'store_version'): + for key in ('rpc_version', 'store_version', 'protocol_version'): resp[key] = int(resp[key]) return resp From 77084fa7b60792af327a88211464084231a902f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Andronache?= Date: Tue, 5 Mar 2019 23:37:27 +0000 Subject: [PATCH 2/2] update tests for new version() --- tests/fixtures/rpc/version.json | 10 ++++++---- tests/test_mock_rpc.py | 5 +++-- tests/test_rpc.py | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/fixtures/rpc/version.json b/tests/fixtures/rpc/version.json index a4dbd27..e8ce442 100644 --- a/tests/fixtures/rpc/version.json +++ b/tests/fixtures/rpc/version.json @@ -1,17 +1,19 @@ [ { "expected": { - "node_vendor": "RaiBlocks 9.0", + "node_vendor": "Nano 18.0", + "protocol_version": 16, "rpc_version": 1, - "store_version": 10 + "store_version": 13 }, "request": { "action": "version" }, "response": { - "node_vendor": "RaiBlocks 9.0", + "node_vendor": "Nano 18.0", + "protocol_version": "16", "rpc_version": "1", - "store_version": "10" + "store_version": "13" } } ] diff --git a/tests/test_mock_rpc.py b/tests/test_mock_rpc.py index 2689f81..60b2708 100644 --- a/tests/test_mock_rpc.py +++ b/tests/test_mock_rpc.py @@ -10,8 +10,9 @@ def test_existing_request(self, mock_rpc_session): ) assert resp.json() == { "rpc_version": "1", - "store_version": "10", - "node_vendor": "RaiBlocks 9.0", + "store_version": "13", + "protocol_version": "16", + "node_vendor": "Nano 18.0", } def test_missing_request(self, mock_rpc_session): diff --git a/tests/test_rpc.py b/tests/test_rpc.py index e389f3c..3135c88 100644 --- a/tests/test_rpc.py +++ b/tests/test_rpc.py @@ -24,8 +24,9 @@ def test_create(self, arguments): def test_call_valid_action(self, rpc): assert rpc.call('version') == { "rpc_version": "1", - "store_version": "10", - "node_vendor": "RaiBlocks 9.0", + "store_version": "13", + "protocol_version": "16", + "node_vendor": "Nano 18.0", } def test_call_invalid_action(self, rpc):