From 427e5fae3f03f28940be20d9bb7ca7134367bf52 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Mon, 26 Feb 2018 10:47:59 -0800 Subject: [PATCH 1/5] Fix references to Bitcoin in RPC tests readme --- qa/rpc-tests/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index cfda8fe91..3bc64eec6 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -36,7 +36,7 @@ If you set the environment variable `PYTHON_DEBUG=1` you will get some debug out A 200-block -regtest blockchain and wallets for four nodes is created the first time a regression test is run and is stored in the cache/ directory. Each node has 25 mature -blocks (25*50=1250 BTC) in its wallet. +blocks (25*50=1250 ZEC) in its wallet. After the first run, the cache/ blockchain and wallets are copied into a temporary directory and used as the initial @@ -47,5 +47,5 @@ to recover with: ```bash rm -rf cache -killall bitcoind +killall zcashd ``` From d8399efc03a55cb36ae59fa865f14c40d151ecc1 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 28 Feb 2018 14:13:07 -0800 Subject: [PATCH 2/5] This library seems to not be used at all and all comments mentioning it are ghosts --- qa/rpc-tests/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index 3bc64eec6..3f715e1fe 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -1,11 +1,6 @@ Regression tests of RPC interface ================================= -### [python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc) -Git subtree of [https://github.com/jgarzik/python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc). -Changes to python-bitcoinrpc should be made upstream, and then -pulled here using git subtree. - ### [test_framework/test_framework.py](test_framework/test_framework.py) Base class for new regression tests. From 62fee1296f21025020e7a7096e139d4f9c87776b Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 28 Feb 2018 14:17:28 -0800 Subject: [PATCH 3/5] Update awkward wording about blocks as per @daira --- qa/rpc-tests/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index 3f715e1fe..daed1b376 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -2,7 +2,7 @@ Regression tests of RPC interface ================================= ### [test_framework/test_framework.py](test_framework/test_framework.py) -Base class for new regression tests. +Base class for RPC regression tests. ### [test_framework/util.py](test_framework/util.py) Generally useful functions. @@ -30,8 +30,8 @@ If you set the environment variable `PYTHON_DEBUG=1` you will get some debug out A 200-block -regtest blockchain and wallets for four nodes is created the first time a regression test is run and -is stored in the cache/ directory. Each node has 25 mature -blocks (25*50=1250 ZEC) in its wallet. +is stored in the cache/ directory. Each node has the miner +subsidy from 25 mature blocks (25*50=1250 ZEC) in its wallet. After the first run, the cache/ blockchain and wallets are copied into a temporary directory and used as the initial From 48cecf2ad95e769da8bd096226b78f07781cee8b Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 28 Feb 2018 14:28:22 -0800 Subject: [PATCH 4/5] Regtest mining does have a founders reward, a single address t2FwcEhFdNXuFMv1tcYwaBJtYVtMj8b1uTg --- qa/rpc-tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md index daed1b376..a0229b56d 100644 --- a/qa/rpc-tests/README.md +++ b/qa/rpc-tests/README.md @@ -31,7 +31,7 @@ If you set the environment variable `PYTHON_DEBUG=1` you will get some debug out A 200-block -regtest blockchain and wallets for four nodes is created the first time a regression test is run and is stored in the cache/ directory. Each node has the miner -subsidy from 25 mature blocks (25*50=1250 ZEC) in its wallet. +subsidy from 25 mature blocks (25*10=250 ZEC) in its wallet. After the first run, the cache/ blockchain and wallets are copied into a temporary directory and used as the initial From 4db87174311a27617ac3eb7936e941566ae25539 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 28 Feb 2018 14:29:05 -0800 Subject: [PATCH 5/5] Fix outdated comment about starting balance of nodes --- qa/rpc-tests/zcjoinsplitdoublespend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/rpc-tests/zcjoinsplitdoublespend.py b/qa/rpc-tests/zcjoinsplitdoublespend.py index b8411c49d..98837b57e 100755 --- a/qa/rpc-tests/zcjoinsplitdoublespend.py +++ b/qa/rpc-tests/zcjoinsplitdoublespend.py @@ -40,7 +40,7 @@ class JoinSplitTest(BitcoinTestFramework): assert_equal(self.cannot_joinsplit(node, txn), True) def run_test(self): - # All nodes should start with 250 BTC: + # All nodes should start with 250 ZEC: starting_balance = 250 for i in range(4): assert_equal(self.nodes[i].getbalance(), starting_balance)