From a8e437a02f2d3d9c7cece4ec89543c7b803ea20f Mon Sep 17 00:00:00 2001 From: John Newbery Date: Fri, 2 Feb 2018 10:59:16 -0500 Subject: [tests] Remove estimatefee from rpc_deprecated.py test --- test/functional/rpc_deprecated.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'test/functional/rpc_deprecated.py') diff --git a/test/functional/rpc_deprecated.py b/test/functional/rpc_deprecated.py index d6f25158ef..689afcb09c 100755 --- a/test/functional/rpc_deprecated.py +++ b/test/functional/rpc_deprecated.py @@ -10,15 +10,9 @@ class DeprecatedRpcTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True - self.extra_args = [[], ["-deprecatedrpc=estimatefee", "-deprecatedrpc=createmultisig"]] + self.extra_args = [[], ["-deprecatedrpc=createmultisig"]] def run_test(self): - self.log.info("estimatefee: Shows deprecated message") - assert_raises_rpc_error(-32, 'estimatefee is deprecated', self.nodes[0].estimatefee, 1) - - self.log.info("Using -deprecatedrpc=estimatefee bypasses the error") - self.nodes[1].estimatefee(1) - self.log.info("Make sure that -deprecatedrpc=createmultisig allows it to take addresses") assert_raises_rpc_error(-5, "Invalid public key", self.nodes[0].createmultisig, 1, [self.nodes[0].getnewaddress()]) self.nodes[1].createmultisig(1, [self.nodes[1].getnewaddress()]) -- cgit v1.2.3 From ed45c8201977aecde226b2e9b060820a8fd677c3 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Fri, 2 Feb 2018 12:46:12 -0500 Subject: [tests] Remove test for deprecated createmultsig option --- test/functional/rpc_deprecated.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'test/functional/rpc_deprecated.py') diff --git a/test/functional/rpc_deprecated.py b/test/functional/rpc_deprecated.py index 689afcb09c..90183474bb 100755 --- a/test/functional/rpc_deprecated.py +++ b/test/functional/rpc_deprecated.py @@ -4,18 +4,24 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test deprecation of RPC calls.""" from test_framework.test_framework import BitcoinTestFramework -from test_framework.util import assert_raises_rpc_error class DeprecatedRpcTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 self.setup_clean_chain = True - self.extra_args = [[], ["-deprecatedrpc=createmultisig"]] + self.extra_args = [[], []] def run_test(self): - self.log.info("Make sure that -deprecatedrpc=createmultisig allows it to take addresses") - assert_raises_rpc_error(-5, "Invalid public key", self.nodes[0].createmultisig, 1, [self.nodes[0].getnewaddress()]) - self.nodes[1].createmultisig(1, [self.nodes[1].getnewaddress()]) + # This test should be used to verify correct behaviour of deprecated + # RPC methods with and without the -deprecatedrpc flags. For example: + # + # self.log.info("Make sure that -deprecatedrpc=createmultisig allows it to take addresses") + # assert_raises_rpc_error(-5, "Invalid public key", self.nodes[0].createmultisig, 1, [self.nodes[0].getnewaddress()]) + # self.nodes[1].createmultisig(1, [self.nodes[1].getnewaddress()]) + # + # There are currently no deprecated RPC methods in master, so this + # test is currently empty. + pass if __name__ == '__main__': DeprecatedRpcTest().main() -- cgit v1.2.3