rpc: Improve addnode remove command error message

This also adds test coverage for the remove command which was uncovered before.

1 files changed, 7 insertions, 0 deletions

diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py
index 3336246c8b..674e034809 100755
--- a/test/functional/rpc_net.py
+++ b/test/functional/rpc_net.py
@@ -131,6 +131,13 @@ class NetTest(BitcoinTestFramework):
         added_nodes = self.nodes[0].getaddednodeinfo(ip_port)
         assert_equal(len(added_nodes), 1)
         assert_equal(added_nodes[0]['addednode'], ip_port)
+        # check that node cannot be added again
+        assert_raises_rpc_error(-23, "Node already added", self.nodes[0].addnode, node=ip_port, command='add')
+        # check that node can be removed
+        self.nodes[0].addnode(node=ip_port, command='remove')
+        assert_equal(self.nodes[0].getaddednodeinfo(), [])
+        # check that trying to remove the node again returns an error
+        assert_raises_rpc_error(-24, "Node could not be removed", self.nodes[0].addnode, node=ip_port, command='remove')
         # check that a non-existent node returns an error
         assert_raises_rpc_error(-24, "Node has not been added", self.nodes[0].getaddednodeinfo, '1.1.1.1')