7 files changed, 348 insertions, 505 deletions
diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md
index 616c0525f4..3e916a7688 100644
--- a/qa/rpc-tests/README.md
+++ b/qa/rpc-tests/README.md
@@ -6,8 +6,8 @@ Git subtree of [https://github.com/jgarzik/python-bitcoinrpc](https://github.com
 Changes to python-bitcoinrpc should be made upstream, and then
 pulled here using git subtree.
 
-### [skeleton.py](skeleton.py)
-Copy this to create new regression tests.
+### [test_framework.py](test_framework.py)
+Base class for new regression tests.
 
 ### [listtransactions.py](listtransactions.py)
 Tests for the listtransactions RPC call.
diff --git a/qa/rpc-tests/listtransactions.py b/qa/rpc-tests/listtransactions.py
index f16095c125..50385b4372 100755
--- a/qa/rpc-tests/listtransactions.py
+++ b/qa/rpc-tests/listtransactions.py
@@ -5,17 +5,7 @@
 
 # Exercise the listtransactions API
 
-# Add python-bitcoinrpc to module search path:
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))
-
-import json
-import shutil
-import subprocess
-import tempfile
-import traceback
-
+from test_framework import BitcoinTestFramework
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
 from util import *
 
@@ -41,116 +31,67 @@ def check_array_result(object_array, to_match, expected):
     if num_matched == 0:
         raise AssertionError("No objects matched %s"%(str(to_match)))
 
-def run_test(nodes):
-    # Simple send, 0 to 1:
-    txid = nodes[0].sendtoaddress(nodes[1].getnewaddress(), 0.1)
-    sync_mempools(nodes)
-    check_array_result(nodes[0].listtransactions(),
-                       {"txid":txid},
-                       {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":0})
-    check_array_result(nodes[1].listtransactions(),
-                       {"txid":txid},
-                       {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":0})
-    # mine a block, confirmations should change:
-    nodes[0].setgenerate(True, 1)
-    sync_blocks(nodes)
-    check_array_result(nodes[0].listtransactions(),
-                       {"txid":txid},
-                       {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":1})
-    check_array_result(nodes[1].listtransactions(),
-                       {"txid":txid},
-                       {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":1})
-
-    # send-to-self:
-    txid = nodes[0].sendtoaddress(nodes[0].getnewaddress(), 0.2)
-    check_array_result(nodes[0].listtransactions(),
-                       {"txid":txid, "category":"send"},
-                       {"amount":Decimal("-0.2")})
-    check_array_result(nodes[0].listtransactions(),
-                       {"txid":txid, "category":"receive"},
-                       {"amount":Decimal("0.2")})
-
-    # sendmany from node1: twice to self, twice to node2:
-    send_to = { nodes[0].getnewaddress() : 0.11, nodes[1].getnewaddress() : 0.22,
-                nodes[0].getaccountaddress("from1") : 0.33, nodes[1].getaccountaddress("toself") : 0.44 }
-    txid = nodes[1].sendmany("", send_to)
-    sync_mempools(nodes)
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"send","amount":Decimal("-0.11")},
-                       {"txid":txid} )
-    check_array_result(nodes[0].listtransactions(),
-                       {"category":"receive","amount":Decimal("0.11")},
-                       {"txid":txid} )
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"send","amount":Decimal("-0.22")},
-                       {"txid":txid} )
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"receive","amount":Decimal("0.22")},
-                       {"txid":txid} )
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"send","amount":Decimal("-0.33")},
-                       {"txid":txid} )
-    check_array_result(nodes[0].listtransactions(),
-                       {"category":"receive","amount":Decimal("0.33")},
-                       {"txid":txid, "account" : "from1"} )
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"send","amount":Decimal("-0.44")},
-                       {"txid":txid, "account" : ""} )
-    check_array_result(nodes[1].listtransactions(),
-                       {"category":"receive","amount":Decimal("0.44")},
-                       {"txid":txid, "account" : "toself"} )
-    
-
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
-                      help="Leave bitcoinds and test.* datadir on exit or error")
-    parser.add_option("--srcdir", dest="srcdir", default="../../src",
-                      help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
-    parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
-                      help="Root directory for datadirs")
-    (options, args) = parser.parse_args()
-
-    os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
-
-    check_json_precision()
-
-    success = False
-    nodes = []
-    try:
-        print("Initializing test directory "+options.tmpdir)
-        if not os.path.isdir(options.tmpdir):
-            os.makedirs(options.tmpdir)
-        initialize_chain(options.tmpdir)
-
-        nodes = start_nodes(2, options.tmpdir)
-        connect_nodes(nodes[1], 0)
+class ListTransactionsTest(BitcoinTestFramework):
+
+    def run_test(self, nodes):
+        # Simple send, 0 to 1:
+        txid = nodes[0].sendtoaddress(nodes[1].getnewaddress(), 0.1)
+        sync_mempools(nodes)
+        check_array_result(nodes[0].listtransactions(),
+                           {"txid":txid},
+                           {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":0})
+        check_array_result(nodes[1].listtransactions(),
+                           {"txid":txid},
+                           {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":0})
+        # mine a block, confirmations should change:
+        nodes[0].setgenerate(True, 1)
         sync_blocks(nodes)
-
-        run_test(nodes)
-
-        success = True
-
-    except AssertionError as e:
-        print("Assertion failed: "+e.message)
-    except Exception as e:
-        print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
-
-    if not options.nocleanup:
-        print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
-        shutil.rmtree(options.tmpdir)
-
-    if success:
-        print("Tests successful")
-        sys.exit(0)
-    else:
-        print("Failed")
-        sys.exit(1)
+        check_array_result(nodes[0].listtransactions(),
+                           {"txid":txid},
+                           {"category":"send","account":"","amount":Decimal("-0.1"),"confirmations":1})
+        check_array_result(nodes[1].listtransactions(),
+                           {"txid":txid},
+                           {"category":"receive","account":"","amount":Decimal("0.1"),"confirmations":1})
+
+        # send-to-self:
+        txid = nodes[0].sendtoaddress(nodes[0].getnewaddress(), 0.2)
+        check_array_result(nodes[0].listtransactions(),
+                           {"txid":txid, "category":"send"},
+                           {"amount":Decimal("-0.2")})
+        check_array_result(nodes[0].listtransactions(),
+                           {"txid":txid, "category":"receive"},
+                           {"amount":Decimal("0.2")})
+
+        # sendmany from node1: twice to self, twice to node2:
+        send_to = { nodes[0].getnewaddress() : 0.11, nodes[1].getnewaddress() : 0.22,
+                    nodes[0].getaccountaddress("from1") : 0.33, nodes[1].getaccountaddress("toself") : 0.44 }
+        txid = nodes[1].sendmany("", send_to)
+        sync_mempools(nodes)
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"send","amount":Decimal("-0.11")},
+                           {"txid":txid} )
+        check_array_result(nodes[0].listtransactions(),
+                           {"category":"receive","amount":Decimal("0.11")},
+                           {"txid":txid} )
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"send","amount":Decimal("-0.22")},
+                           {"txid":txid} )
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"receive","amount":Decimal("0.22")},
+                           {"txid":txid} )
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"send","amount":Decimal("-0.33")},
+                           {"txid":txid} )
+        check_array_result(nodes[0].listtransactions(),
+                           {"category":"receive","amount":Decimal("0.33")},
+                           {"txid":txid, "account" : "from1"} )
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"send","amount":Decimal("-0.44")},
+                           {"txid":txid, "account" : ""} )
+        check_array_result(nodes[1].listtransactions(),
+                           {"category":"receive","amount":Decimal("0.44")},
+                           {"txid":txid, "account" : "toself"} )
 
 if __name__ == '__main__':
-    main()
+    ListTransactionsTest().main()
+
diff --git a/qa/rpc-tests/receivedby.py b/qa/rpc-tests/receivedby.py
index 7f2d79b3c1..61f5e0452b 100755
--- a/qa/rpc-tests/receivedby.py
+++ b/qa/rpc-tests/receivedby.py
@@ -3,23 +3,13 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-# Exercise the listtransactions API
-
-# Add python-bitcoinrpc to module search path:
-
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))
-
-import json
-import shutil
-import subprocess
-import tempfile
-import traceback
+# Exercise the listreceivedbyaddress API
 
+from test_framework import BitcoinTestFramework
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
 from util import *
 
+
 def get_sub_array_from_array(object_array, to_match):
     '''
         Finds and returns a sub array from an array of arrays.
@@ -62,164 +52,115 @@ def check_array_result(object_array, to_match, expected, should_not_find = False
     if num_matched > 0 and should_not_find == True:
         raise AssertionError("Objects was matched %s"%(str(to_match)))
 
-def run_test(nodes):
-    '''
-        listreceivedbyaddress Test
-    '''
-    # Send from node 0 to 1
-    addr = nodes[1].getnewaddress()
-    txid = nodes[0].sendtoaddress(addr, 0.1)
-    sync_mempools(nodes)
-    
-    #Check not listed in listreceivedbyaddress because has 0 confirmations
-    check_array_result(nodes[1].listreceivedbyaddress(),
-                       {"address":addr},
-                       { },
-                       True)
-    #Bury Tx under 10 block so it will be returned by listreceivedbyaddress
-    nodes[1].setgenerate(True, 10)
-    sync_blocks(nodes)
-    check_array_result(nodes[1].listreceivedbyaddress(),
-                       {"address":addr},
-                       {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
-    #With min confidence < 10
-    check_array_result(nodes[1].listreceivedbyaddress(5),
-                       {"address":addr},
-                       {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
-    #With min confidence > 10, should not find Tx
-    check_array_result(nodes[1].listreceivedbyaddress(11),{"address":addr},{ },True)
-
-    #Empty Tx
-    addr = nodes[1].getnewaddress()
-    check_array_result(nodes[1].listreceivedbyaddress(0,True),
-                       {"address":addr},
-                       {"address":addr, "account":"", "amount":0, "confirmations":0, "txids":[]})
-
-    '''
-        getreceivedbyaddress Test
-    '''
-    # Send from node 0 to 1
-    addr = nodes[1].getnewaddress()
-    txid = nodes[0].sendtoaddress(addr, 0.1)
-    sync_mempools(nodes)
-
-    #Check balance is 0 because of 0 confirmations
-    balance = nodes[1].getreceivedbyaddress(addr)
-    if balance != Decimal("0.0"):
-        raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
-
-    #Check balance is 0.1
-    balance = nodes[1].getreceivedbyaddress(addr,0)
-    if balance != Decimal("0.1"):
-        raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
-
-    #Bury Tx under 10 block so it will be returned by the default getreceivedbyaddress
-    nodes[1].setgenerate(True, 10)
-    sync_blocks(nodes)
-    balance = nodes[1].getreceivedbyaddress(addr)
-    if balance != Decimal("0.1"):
-        raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
+class ReceivedByTest(BitcoinTestFramework):
 
-    '''
-        listreceivedbyaccount + getreceivedbyaccount Test
-    '''
-    #set pre-state
-    addrArr = nodes[1].getnewaddress()
-    account = nodes[1].getaccount(addrArr)
-    received_by_account_json = get_sub_array_from_array(nodes[1].listreceivedbyaccount(),{"account":account})
-    if len(received_by_account_json) == 0:
-        raise AssertionError("No accounts found in node")
-    balance_by_account = rec_by_accountArr = nodes[1].getreceivedbyaccount(account)
-
-    txid = nodes[0].sendtoaddress(addr, 0.1)
-
-    # listreceivedbyaccount should return received_by_account_json because of 0 confirmations
-    check_array_result(nodes[1].listreceivedbyaccount(),
-                   {"account":account},
-                   received_by_account_json)
-
-    # getreceivedbyaddress should return same balance because of 0 confirmations
-    balance = nodes[1].getreceivedbyaccount(account)
-    if balance != balance_by_account:
-        raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
-
-    nodes[1].setgenerate(True, 10)
-    sync_blocks(nodes)
-    # listreceivedbyaccount should return updated account balance
-    check_array_result(nodes[1].listreceivedbyaccount(),
-                       {"account":account},
-                       {"account":received_by_account_json["account"], "amount":(received_by_account_json["amount"] + Decimal("0.1"))})
-
-    # getreceivedbyaddress should return updates balance
-    balance = nodes[1].getreceivedbyaccount(account)
-    if balance != balance_by_account + Decimal("0.1"):
-        raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
-
-    #Create a new account named "mynewaccount" that has a 0 balance
-    nodes[1].getaccountaddress("mynewaccount")
-    received_by_account_json = get_sub_array_from_array(nodes[1].listreceivedbyaccount(0,True),{"account":"mynewaccount"})
-    if len(received_by_account_json) == 0:
-        raise AssertionError("No accounts found in node")
-
-    # Test includeempty of listreceivedbyaccount
-    if received_by_account_json["amount"] != Decimal("0.0"):
-        raise AssertionError("Wrong balance returned by listreceivedbyaccount, %0.2f"%(received_by_account_json["amount"]))
-
-    # Test getreceivedbyaccount for 0 amount accounts
-    balance = nodes[1].getreceivedbyaccount("mynewaccount")
-    if balance != Decimal("0.0"):
-        raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
-
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
-                      help="Leave bitcoinds and test.* datadir on exit or error")
-    parser.add_option("--srcdir", dest="srcdir", default="../../src",
-                      help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
-    parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
-                      help="Root directory for datadirs")
-    (options, args) = parser.parse_args()
-
-    os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
-
-    check_json_precision()
-
-    success = False
-    nodes = []
-    try:
-        print("Initializing test directory "+options.tmpdir)
-        if not os.path.isdir(options.tmpdir):
-            os.makedirs(options.tmpdir)
-        initialize_chain(options.tmpdir)
-
-        nodes = start_nodes(2, options.tmpdir)
-        connect_nodes(nodes[1], 0)
+    def run_test(self, nodes):
+        '''
+        listreceivedbyaddress Test
+        '''
+        # Send from node 0 to 1
+        addr = nodes[1].getnewaddress()
+        txid = nodes[0].sendtoaddress(addr, 0.1)
+        sync_mempools(nodes)
+
+        #Check not listed in listreceivedbyaddress because has 0 confirmations
+        check_array_result(nodes[1].listreceivedbyaddress(),
+                           {"address":addr},
+                           { },
+                           True)
+        #Bury Tx under 10 block so it will be returned by listreceivedbyaddress
+        nodes[1].setgenerate(True, 10)
         sync_blocks(nodes)
-
-        run_test(nodes)
-
-        success = True
-
-    except AssertionError as e:
-        print("Assertion failed: "+e.message)
-    except Exception as e:
-        print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
-
-    if not options.nocleanup:
-        print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
-        shutil.rmtree(options.tmpdir)
-
-    if success:
-        print("Tests successful")
-        sys.exit(0)
-    else:
-        print("Failed")
-        sys.exit(1)
+        check_array_result(nodes[1].listreceivedbyaddress(),
+                           {"address":addr},
+                           {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
+        #With min confidence < 10
+        check_array_result(nodes[1].listreceivedbyaddress(5),
+                           {"address":addr},
+                           {"address":addr, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
+        #With min confidence > 10, should not find Tx
+        check_array_result(nodes[1].listreceivedbyaddress(11),{"address":addr},{ },True)
+
+        #Empty Tx
+        addr = nodes[1].getnewaddress()
+        check_array_result(nodes[1].listreceivedbyaddress(0,True),
+                           {"address":addr},
+                           {"address":addr, "account":"", "amount":0, "confirmations":0, "txids":[]})
+
+        '''
+            getreceivedbyaddress Test
+        '''
+        # Send from node 0 to 1
+        addr = nodes[1].getnewaddress()
+        txid = nodes[0].sendtoaddress(addr, 0.1)
+        sync_mempools(nodes)
+
+        #Check balance is 0 because of 0 confirmations
+        balance = nodes[1].getreceivedbyaddress(addr)
+        if balance != Decimal("0.0"):
+            raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
+
+        #Check balance is 0.1
+        balance = nodes[1].getreceivedbyaddress(addr,0)
+        if balance != Decimal("0.1"):
+            raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
+
+        #Bury Tx under 10 block so it will be returned by the default getreceivedbyaddress
+        nodes[1].setgenerate(True, 10)
+        sync_blocks(nodes)
+        balance = nodes[1].getreceivedbyaddress(addr)
+        if balance != Decimal("0.1"):
+            raise AssertionError("Wrong balance returned by getreceivedbyaddress, %0.2f"%(balance))
+
+        '''
+            listreceivedbyaccount + getreceivedbyaccount Test
+        '''
+        #set pre-state
+        addrArr = nodes[1].getnewaddress()
+        account = nodes[1].getaccount(addrArr)
+        received_by_account_json = get_sub_array_from_array(nodes[1].listreceivedbyaccount(),{"account":account})
+        if len(received_by_account_json) == 0:
+            raise AssertionError("No accounts found in node")
+        balance_by_account = rec_by_accountArr = nodes[1].getreceivedbyaccount(account)
+
+        txid = nodes[0].sendtoaddress(addr, 0.1)
+
+        # listreceivedbyaccount should return received_by_account_json because of 0 confirmations
+        check_array_result(nodes[1].listreceivedbyaccount(),
+                           {"account":account},
+                           received_by_account_json)
+
+        # getreceivedbyaddress should return same balance because of 0 confirmations
+        balance = nodes[1].getreceivedbyaccount(account)
+        if balance != balance_by_account:
+            raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
+
+        nodes[1].setgenerate(True, 10)
+        sync_blocks(nodes)
+        # listreceivedbyaccount should return updated account balance
+        check_array_result(nodes[1].listreceivedbyaccount(),
+                           {"account":account},
+                           {"account":received_by_account_json["account"], "amount":(received_by_account_json["amount"] + Decimal("0.1"))})
+
+        # getreceivedbyaddress should return updates balance
+        balance = nodes[1].getreceivedbyaccount(account)
+        if balance != balance_by_account + Decimal("0.1"):
+            raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
+
+        #Create a new account named "mynewaccount" that has a 0 balance
+        nodes[1].getaccountaddress("mynewaccount")
+        received_by_account_json = get_sub_array_from_array(nodes[1].listreceivedbyaccount(0,True),{"account":"mynewaccount"})
+        if len(received_by_account_json) == 0:
+            raise AssertionError("No accounts found in node")
+
+        # Test includeempty of listreceivedbyaccount
+        if received_by_account_json["amount"] != Decimal("0.0"):
+            raise AssertionError("Wrong balance returned by listreceivedbyaccount, %0.2f"%(received_by_account_json["amount"]))
+
+        # Test getreceivedbyaccount for 0 amount accounts
+        balance = nodes[1].getreceivedbyaccount("mynewaccount")
+        if balance != Decimal("0.0"):
+            raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
 
 if __name__ == '__main__':
-    main()
+    ReceivedByTest().main()
diff --git a/qa/rpc-tests/skeleton.py b/qa/rpc-tests/skeleton.py
deleted file mode 100755
index 126b6bfaf4..0000000000
--- a/qa/rpc-tests/skeleton.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-# Skeleton for python-based regression tests using
-# JSON-RPC
-
-
-# Add python-bitcoinrpc to module search path:
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))
-
-import json
-import shutil
-import subprocess
-import tempfile
-import traceback
-
-from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
-from util import *
-
-
-def run_test(nodes):
-    # Replace this as appropriate
-    for node in nodes:
-        assert_equal(node.getblockcount(), 200)
-        assert_equal(node.getbalance(), 25*50)
-
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
-                      help="Leave bitcoinds and test.* datadir on exit or error")
-    parser.add_option("--srcdir", dest="srcdir", default="../../src",
-                      help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
-    parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
-                      help="Root directory for datadirs")
-    (options, args) = parser.parse_args()
-
-    os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
-
-    check_json_precision()
-
-    success = False
-    nodes = []
-    try:
-        print("Initializing test directory "+options.tmpdir)
-        if not os.path.isdir(options.tmpdir):
-            os.makedirs(options.tmpdir)
-        initialize_chain(options.tmpdir)
-
-        nodes = start_nodes(2, options.tmpdir)
-        connect_nodes(nodes[1], 0)
-        sync_blocks(nodes)
-
-        run_test(nodes)
-
-        success = True
-
-    except AssertionError as e:
-        print("Assertion failed: "+e.message)
-    except Exception as e:
-        print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
-
-    if not options.nocleanup:
-        print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
-        shutil.rmtree(options.tmpdir)
-
-    if success:
-        print("Tests successful")
-        sys.exit(0)
-    else:
-        print("Failed")
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index e8abbfba19..352a1de2d0 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -4,139 +4,86 @@
 # Test fee estimation code
 #
 
-# Add python-bitcoinrpc to module search path:
-import os
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))
-
-import json
-import random
-import shutil
-import subprocess
-import tempfile
-import traceback
-
+from test_framework import BitcoinTestFramework
 from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
 from util import *
 
+class EstimateFeeTest(BitcoinTestFramework):
 
-def run_test(nodes, test_dir):
-    nodes.append(start_node(0, test_dir,
+    def setup_network(self, test_dir):
+        nodes = []
+        nodes.append(start_node(0, test_dir,
                             ["-debug=mempool", "-debug=estimatefee"]))
-    # Node1 mines small-but-not-tiny blocks, and allows free transactions.
-    # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,
-    # so blockmaxsize of 2,000 is really just 1,000 bytes (room enough for
-    # 6 or 7 transactions)
-    nodes.append(start_node(1, test_dir,
-                            ["-blockprioritysize=1500", "-blockmaxsize=2000",
-                             "-debug=mempool", "-debug=estimatefee"]))
-    connect_nodes(nodes[1], 0)
-
-    # Node2 is a stingy miner, that
-    # produces very small blocks (room for only 3 or so transactions)
-    node2args = [ "-blockprioritysize=0", "-blockmaxsize=1500",
-                             "-debug=mempool", "-debug=estimatefee"]
-    nodes.append(start_node(2, test_dir, node2args))
-    connect_nodes(nodes[2], 0)
-
-    sync_blocks(nodes)
-
-    # Prime the memory pool with pairs of transactions
-    # (high-priority, random fee and zero-priority, random fee)
-    min_fee = Decimal("0.001")
-    fees_per_kb = [];
-    for i in range(12):
-        (txid, txhex, fee) = random_zeropri_transaction(nodes, Decimal("1.1"),
-                                                        min_fee, min_fee, 20)
-        tx_kbytes = (len(txhex)/2)/1000.0
-        fees_per_kb.append(float(fee)/tx_kbytes)
-
-    # Mine blocks with node2 until the memory pool clears:
-    count_start = nodes[2].getblockcount()
-    while len(nodes[2].getrawmempool()) > 0:
-        nodes[2].setgenerate(True, 1)
-        sync_blocks(nodes)
-
-    all_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
-    print("Fee estimates, super-stingy miner: "+str([str(e) for e in all_estimates]))
-
-    # Estimates should be within the bounds of what transactions fees actually were:
-    delta = 1.0e-6 # account for rounding error
-    for e in filter(lambda x: x >= 0, all_estimates):
-        if float(e)+delta < min(fees_per_kb) or float(e)-delta > max(fees_per_kb):
-            raise AssertionError("Estimated fee (%f) out of range (%f,%f)"%(float(e), min_fee_kb, max_fee_kb))
+        # Node1 mines small-but-not-tiny blocks, and allows free transactions.
+        # NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,
+        # so blockmaxsize of 2,000 is really just 1,000 bytes (room enough for
+        # 6 or 7 transactions)
+        nodes.append(start_node(1, test_dir,
+                                ["-blockprioritysize=1500", "-blockmaxsize=2000",
+                                 "-debug=mempool", "-debug=estimatefee"]))
+        connect_nodes(nodes[1], 0)
+
+        # Node2 is a stingy miner, that
+        # produces very small blocks (room for only 3 or so transactions)
+        node2args = [ "-blockprioritysize=0", "-blockmaxsize=1500",
+                      "-debug=mempool", "-debug=estimatefee"]
+        nodes.append(start_node(2, test_dir, node2args))
+        connect_nodes(nodes[2], 0)
 
-    # Generate transactions while mining 30 more blocks, this time with node1:
-    for i in range(30):
-        for j in range(random.randrange(6-4,6+4)):
-            (txid, txhex, fee) = random_transaction(nodes, Decimal("1.1"),
-                                                    Decimal("0.0"), min_fee, 20)
+        sync_blocks(nodes)
+        return nodes
+        
+
+    def run_test(self, nodes):
+        # Prime the memory pool with pairs of transactions
+        # (high-priority, random fee and zero-priority, random fee)
+        min_fee = Decimal("0.001")
+        fees_per_kb = [];
+        for i in range(12):
+            (txid, txhex, fee) = random_zeropri_transaction(nodes, Decimal("1.1"),
+                                                            min_fee, min_fee, 20)
             tx_kbytes = (len(txhex)/2)/1000.0
             fees_per_kb.append(float(fee)/tx_kbytes)
-        nodes[1].setgenerate(True, 1)
-        sync_blocks(nodes)
 
-    all_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
-    print("Fee estimates, more generous miner: "+str([ str(e) for e in all_estimates]))
-    for e in filter(lambda x: x >= 0, all_estimates):
-        if float(e)+delta < min(fees_per_kb) or float(e)-delta > max(fees_per_kb):
-            raise AssertionError("Estimated fee (%f) out of range (%f,%f)"%(float(e), min_fee_kb, max_fee_kb))
-
-    # Finish by mining a normal-sized block:
-    while len(nodes[0].getrawmempool()) > 0:
-        nodes[0].setgenerate(True, 1)
-        sync_blocks(nodes)
+        # Mine blocks with node2 until the memory pool clears:
+        count_start = nodes[2].getblockcount()
+        while len(nodes[2].getrawmempool()) > 0:
+            nodes[2].setgenerate(True, 1)
+            sync_blocks(nodes)
+
+        all_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
+        print("Fee estimates, super-stingy miner: "+str([str(e) for e in all_estimates]))
+
+        # Estimates should be within the bounds of what transactions fees actually were:
+        delta = 1.0e-6 # account for rounding error
+        for e in filter(lambda x: x >= 0, all_estimates):
+            if float(e)+delta < min(fees_per_kb) or float(e)-delta > max(fees_per_kb):
+                raise AssertionError("Estimated fee (%f) out of range (%f,%f)"%(float(e), min_fee_kb, max_fee_kb))
+
+        # Generate transactions while mining 30 more blocks, this time with node1:
+        for i in range(30):
+            for j in range(random.randrange(6-4,6+4)):
+                (txid, txhex, fee) = random_transaction(nodes, Decimal("1.1"),
+                                                        Decimal("0.0"), min_fee, 20)
+                tx_kbytes = (len(txhex)/2)/1000.0
+                fees_per_kb.append(float(fee)/tx_kbytes)
+            nodes[1].setgenerate(True, 1)
+            sync_blocks(nodes)
+
+        all_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
+        print("Fee estimates, more generous miner: "+str([ str(e) for e in all_estimates]))
+        for e in filter(lambda x: x >= 0, all_estimates):
+            if float(e)+delta < min(fees_per_kb) or float(e)-delta > max(fees_per_kb):
+                raise AssertionError("Estimated fee (%f) out of range (%f,%f)"%(float(e), min_fee_kb, max_fee_kb))
+
+        # Finish by mining a normal-sized block:
+        while len(nodes[0].getrawmempool()) > 0:
+            nodes[0].setgenerate(True, 1)
+            sync_blocks(nodes)
+
+        final_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
+        print("Final fee estimates: "+str([ str(e) for e in final_estimates]))
 
-    final_estimates = [ nodes[0].estimatefee(i) for i in range(1,20) ]
-    print("Final fee estimates: "+str([ str(e) for e in final_estimates]))
-
-def main():
-    import optparse
-
-    parser = optparse.OptionParser(usage="%prog [options]")
-    parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
-                      help="Leave bitcoinds and test.* datadir on exit or error")
-    parser.add_option("--srcdir", dest="srcdir", default="../../src",
-                      help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
-    parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
-                      help="Root directory for datadirs")
-    (options, args) = parser.parse_args()
-
-    os.environ['PATH'] = options.srcdir+":"+os.environ['PATH']
-
-    check_json_precision()
-
-    success = False
-    nodes = []
-    try:
-        print("Initializing test directory "+options.tmpdir)
-        print("  node0 running at: 127.0.0.1:%d"%(p2p_port(0)))
-        if not os.path.isdir(options.tmpdir):
-            os.makedirs(options.tmpdir)
-        initialize_chain(options.tmpdir)
-
-        run_test(nodes, options.tmpdir)
-
-        success = True
-
-    except AssertionError as e:
-        print("Assertion failed: "+e.message)
-    except Exception as e:
-        print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
-
-    if not options.nocleanup:
-        print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
-        shutil.rmtree(options.tmpdir)
-
-    if success:
-        print("Tests successful")
-        sys.exit(0)
-    else:
-        print("Failed")
-        sys.exit(1)
 
 if __name__ == '__main__':
-    main()
+    EstimateFeeTest().main()
diff --git a/qa/rpc-tests/test_framework.py b/qa/rpc-tests/test_framework.py
new file mode 100755
index 0000000000..5a18556655
--- /dev/null
+++ b/qa/rpc-tests/test_framework.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# Copyright (c) 2014 The Bitcoin Core developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+# Base class for RPC testing
+
+# Add python-bitcoinrpc to module search path:
+import os
+import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), "python-bitcoinrpc"))
+
+import shutil
+import tempfile
+import traceback
+
+from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException
+from util import *
+
+
+class BitcoinTestFramework(object):
+
+    # These may be over-ridden by subclasses:
+    def run_test(self, nodes):
+            assert_equal(node.getblockcount(), 200)
+            assert_equal(node.getbalance(), 25*50)
+
+    def add_options(self, parser):
+        pass
+
+    def setup_chain(self, tmp_directory):
+        print("Initializing test directory "+tmp_directory)
+        initialize_chain(tmp_directory)
+
+    def setup_network(self, tmp_directory):
+        nodes = start_nodes(2, tmp_directory)
+        connect_nodes(nodes[1], 0)
+        sync_blocks(nodes)
+        return nodes
+
+    def main(self):
+        import optparse
+
+        parser = optparse.OptionParser(usage="%prog [options]")
+        parser.add_option("--nocleanup", dest="nocleanup", default=False, action="store_true",
+                          help="Leave bitcoinds and test.* datadir on exit or error")
+        parser.add_option("--srcdir", dest="srcdir", default="../../src",
+                          help="Source directory containing bitcoind/bitcoin-cli (default: %default%)")
+        parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
+                          help="Root directory for datadirs")
+        self.add_options(parser)
+        (self.options, self.args) = parser.parse_args()
+
+        os.environ['PATH'] = self.options.srcdir+":"+os.environ['PATH']
+
+        check_json_precision()
+
+        success = False
+        nodes = []
+        try:
+            if not os.path.isdir(self.options.tmpdir):
+                os.makedirs(self.options.tmpdir)
+            self.setup_chain(self.options.tmpdir)
+
+            nodes = self.setup_network(self.options.tmpdir)
+
+            self.run_test(nodes)
+
+            success = True
+
+        except JSONRPCException as e:
+            print("JSONRPC error: "+e.error['message'])
+            traceback.print_tb(sys.exc_info()[2])
+        except AssertionError as e:
+            print("Assertion failed: "+e.message)
+            traceback.print_tb(sys.exc_info()[2])
+        except Exception as e:
+            print("Unexpected exception caught during testing: "+str(e))
+            traceback.print_tb(sys.exc_info()[2])
+
+        if not self.options.nocleanup:
+            print("Cleaning up")
+            stop_nodes(nodes)
+            wait_bitcoinds()
+            shutil.rmtree(self.options.tmpdir)
+
+        if success:
+            print("Tests successful")
+            sys.exit(0)
+        else:
+            print("Failed")
+            sys.exit(1)
diff --git a/qa/rpc-tests/util.py b/qa/rpc-tests/util.py
index 27c9f778f6..0a7f26ffcd 100644
--- a/qa/rpc-tests/util.py
+++ b/qa/rpc-tests/util.py
@@ -59,7 +59,7 @@ def sync_mempools(rpc_connections):
         time.sleep(1)
         
 
-bitcoind_processes = []
+bitcoind_processes = {}
 
 def initialize_datadir(dir, n):
     datadir = os.path.join(dir, "node"+str(n))
@@ -88,7 +88,7 @@ def initialize_chain(test_dir):
             args = [ "bitcoind", "-keypool=1", "-datadir="+datadir ]
             if i > 0:
                 args.append("-connect=127.0.0.1:"+str(p2p_port(0)))
-            bitcoind_processes.append(subprocess.Popen(args))
+            bitcoind_processes[i] = subprocess.Popen(args)
             subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir,
                                     "-rpcwait", "getblockcount"], stdout=devnull)
         devnull.close()
@@ -149,7 +149,7 @@ def start_node(i, dir, extra_args=None, rpchost=None):
     datadir = os.path.join(dir, "node"+str(i))
     args = [ "bitcoind", "-datadir="+datadir, "-keypool=1" ]
     if extra_args is not None: args.extend(extra_args)
-    bitcoind_processes.append(subprocess.Popen(args))
+    bitcoind_processes[i] = subprocess.Popen(args)
     devnull = open("/dev/null", "w+")
     subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir] +
                           _rpchost_to_args(rpchost)  +
@@ -168,6 +168,11 @@ def start_nodes(num_nodes, dir, extra_args=None, rpchost=None):
 def debug_log(dir, n_node):
     return os.path.join(dir, "node"+str(n_node), "regtest", "debug.log")
 
+def stop_node(node, i):
+    node.stop()
+    bitcoind_processes[i].wait()
+    del bitcoind_processes[i]
+
 def stop_nodes(nodes):
     for i in range(len(nodes)):
         nodes[i].stop()
@@ -175,9 +180,9 @@ def stop_nodes(nodes):
 
 def wait_bitcoinds():
     # Wait for all bitcoinds to cleanly exit
-    for bitcoind in bitcoind_processes:
+    for bitcoind in bitcoind_processes.values():
         bitcoind.wait()
-    del bitcoind_processes[:]
+    bitcoind_processes.clear()
 
 def connect_nodes(from_connection, node_num):
     ip_port = "127.0.0.1:"+str(p2p_port(node_num))