aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-04-11 16:47:10 -0400
committerJohn Newbery <john@johnnewbery.com>2017-06-27 16:02:18 +0100
commit11ba8e9cdd2652835c650b9f72d8421ea10f4116 (patch)
tree45c61206020a215aaa5099d29fc3fd872d957987 /test
parentb29dd41f0f8482fb6dbaa4f9fa468ac66069f207 (diff)
downloadbitcoin-11ba8e9cdd2652835c650b9f72d8421ea10f4116.tar.xz
[tests] rename getblocktemplate_proposals.py to mining.py
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/mining.py (renamed from test/functional/getblocktemplate_proposals.py)9
-rwxr-xr-xtest/functional/test_runner.py2
2 files changed, 7 insertions, 4 deletions
diff --git a/test/functional/getblocktemplate_proposals.py b/test/functional/mining.py
index 311d9197ac..dbd4e29eca 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 9952835951..d411534ca2 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',