Merge #1230: Removes test_full_coinjoin

3b3bd39 Replaces test_full_coinjoin with test_e2e_coinjoin (Adam Gibson)

Author: AdamISZ

docs/TESTING.md

@@ -25,7 +25,7 @@ Then copy the `regtest_joinmarket.cfg` file from the `test/` directory to the `j
 
 Run the test suite via pytest:
 
-    (jmvenv)$ pytest --btcconf=/path/to/bitcoin.conf --btcroot=/path/to/bitcoin/bin/ --btcpwd=123456abcdef --nirc=2 --ignore test/test_full_coinjoin.py -p no:warnings
+    (jmvenv)$ pytest --btcconf=/path/to/bitcoin.conf --btcroot=/path/to/bitcoin/bin/ --btcpwd=123456abcdef --nirc=2 -p no:warnings
 
 #### Running tests of sendpayment and tumbler (including with malicious makers)
 

test/run_tests.sh

@@ -222,8 +222,7 @@ run_jm_tests ()
         --btcroot=$btcroot \
         --btcuser=$btcuser \
         --nirc=$nirc \
-        -p no:warnings \
-        --ignore test/test_full_coinjoin.py
+        -p no:warnings
     local success="$?"
     [[ -f ./joinmarket.cfg ]] && unlink ./joinmarket.cfg
     if [ -f "${jm_test_datadir}/bitcoind.pid" ] && read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then

test/e2e-coinjoin-test.py renamed to test/test_e2e_coinjoin.py

@@ -24,19 +24,11 @@
 from jmclient import (YieldGeneratorBasic, load_test_config, jm_single,
     JMClientProtocolFactory, start_reactor, SegwitWallet, get_mchannels,
     SegwitLegacyWallet, JMWalletDaemon)
+import jmclient
 from jmclient.wallet_rpc import api_version_string
 
 log = get_log()
 
-# For quicker testing, restrict the range of timelock
-# addresses to avoid slow load of multiple bots.
-# Note: no need to revert this change as test runs
-# in isolation.
-from jmclient import FidelityBondMixin
-FidelityBondMixin.TIMELOCK_ERA_YEARS = 2
-FidelityBondMixin.TIMELOCK_EPOCH_YEAR = datetime.now().year
-FidelityBondMixin.TIMENUMBERS_PER_PUBKEY = 12
-
 wallet_name = "test-onion-yg-runner.jmdat"
 
 mean_amt = 2.0
@@ -196,8 +188,7 @@ def test_start_yg_and_taker_setup(setup_onion_ygrunner):
     wallet_service = wallet_services[end_bot_num - 1]['wallet']
     jmprint("\n\nTaker wallet seed : " + wallet_services[end_bot_num - 1]['seed'])
     # for manual audit if necessary, show the maker's wallet seeds
-    # also (note this audit should be automated in future, see
-    # test_full_coinjoin.py in this directory)
+    # also (note this audit should be automated in future)
     jmprint("\n\nMaker wallet seeds: ")
     for i in range(start_bot_num, end_bot_num):
         jmprint("Maker seed: " + wallet_services[i - 1]['seed'])
@@ -331,8 +322,12 @@ def process_coinjoin_response(response):
     json_body = json.loads(response.decode("utf-8"))
     print("coinjoin response: {}".format(json_body))
 
-@pytest.fixture(scope="module")
-def setup_onion_ygrunner():
+@pytest.fixture
+def setup_onion_ygrunner(monkeypatch):
+    # For quicker testing, restrict the range of timelock
+    # addresses to avoid slow load of multiple bots.    
+    monkeypatch.setattr(jmclient.FidelityBondMixin, 'TIMELOCK_ERA_YEARS', 2)
+    monkeypatch.setattr(jmclient.FidelityBondMixin, 'TIMELOCK_EPOCH_YEAR', datetime.now().year)
     load_test_config()
     jm_single().bc_interface.tick_forward_chain_interval = 10
     jm_single().bc_interface.simulate_blocks()

test/test_full_coinjoin.py

@@ -123,8 +123,7 @@ def test_start_ygs(setup_ygrunner, num_ygs, wallet_structures, fb_indices,
     wallet_service = wallet_services[num_ygs]['wallet']
     jmprint("\n\nTaker wallet seed : " + wallet_services[num_ygs]['seed'])
     # for manual audit if necessary, show the maker's wallet seeds
-    # also (note this audit should be automated in future, see
-    # test_full_coinjoin.py in this directory)
+    # also (note this audit should be automated in future)
     jmprint("\n\nMaker wallet seeds: ")
     for i in range(num_ygs):
         jmprint("Maker seed: " + wallet_services[i]['seed'])