From 11ba8e9cdd2652835c650b9f72d8421ea10f4116 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 11 Apr 2017 16:47:10 -0400 Subject: [PATCH] [tests] rename getblocktemplate_proposals.py to mining.py --- .../{getblocktemplate_proposals.py => mining.py} | 9 ++++++--- test/functional/test_runner.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) rename test/functional/{getblocktemplate_proposals.py => mining.py} (97%) diff --git a/test/functional/getblocktemplate_proposals.py b/test/functional/mining.py similarity index 97% rename from test/functional/getblocktemplate_proposals.py rename to test/functional/mining.py index 311d9197a..dbd4e29ec 100755 --- a/test/functional/getblocktemplate_proposals.py +++ b/test/functional/mining.py @@ -2,7 +2,10 @@ # Copyright (c) 2014-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -"""Test block proposals with getblocktemplate.""" +"""Test mining RPCs + +- getblocktemplate proposal mode +- submitblock""" from binascii import b2a_hex import copy @@ -21,7 +24,7 @@ def assert_template(node, block, expect, rehash=True): rsp = node.getblocktemplate({'data': b2x(block.serialize()), 'mode': 'proposal'}) assert_equal(rsp, expect) -class GetBlockTemplateProposalTest(BitcoinTestFramework): +class MiningTest(BitcoinTestFramework): def __init__(self): super().__init__() @@ -118,4 +121,4 @@ class GetBlockTemplateProposalTest(BitcoinTestFramework): assert_template(node, bad_block, 'inconclusive-not-best-prevblk') if __name__ == '__main__': - GetBlockTemplateProposalTest().main() + MiningTest().main() diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 995283595..d411534ca 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -108,6 +108,7 @@ BASE_SCRIPTS= [ 'signmessages.py', 'nulldummy.py', 'import-rescan.py', + 'mining.py', 'bumpfee.py', 'rpcnamedargs.py', 'listsinceblock.py', @@ -140,7 +141,6 @@ EXTENDED_SCRIPTS = [ 'bipdersig-p2p.py', 'bipdersig.py', 'example_test.py', - 'getblocktemplate_proposals.py', 'txn_doublespend.py', 'txn_clone.py --mineblock', 'forknotify.py',