From f44ca874ecb21eb6f73485eb5dac046bf0322db3 Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Fri, 3 Oct 2025 10:34:04 +0000 Subject: [PATCH] cmdtest_d.httpd: initialize with cfg --- test/cmdtest_d/ethbump.py | 2 +- test/cmdtest_d/ethdev.py | 2 +- test/cmdtest_d/ethswap.py | 2 +- test/cmdtest_d/httpd/__init__.py | 3 +++ test/cmdtest_d/httpd/thornode/swap.py | 11 ++++------- test/cmdtest_d/rune.py | 2 +- test/cmdtest_d/runeswap.py | 2 +- test/cmdtest_d/swap.py | 2 +- test/modtest_d/rune.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/cmdtest_d/ethbump.py b/test/cmdtest_d/ethbump.py index 59254515..24051a57 100755 --- a/test/cmdtest_d/ethbump.py +++ b/test/cmdtest_d/ethbump.py @@ -285,7 +285,7 @@ class CmdTestEthBump(CmdTestEthBumpMethods, CmdTestEthSwapMethods, CmdTestSwapMe globals()[self.cross_group] = self.create_cross_runner(trunner) - self.swap_server = ThornodeSwapServer() + self.swap_server = ThornodeSwapServer(cfg) self.swap_server.start() def txcreate1(self): diff --git a/test/cmdtest_d/ethdev.py b/test/cmdtest_d/ethdev.py index f9061cbd..9f1c1545 100755 --- a/test/cmdtest_d/ethdev.py +++ b/test/cmdtest_d/ethdev.py @@ -66,7 +66,7 @@ from .base import CmdTestBase from .shared import CmdTestShared from .httpd.etherscan import EtherscanServer -etherscan_server = EtherscanServer() +etherscan_server = EtherscanServer(cfg) del_addrs = ('4', '1') diff --git a/test/cmdtest_d/ethswap.py b/test/cmdtest_d/ethswap.py index 9011234d..633a397f 100755 --- a/test/cmdtest_d/ethswap.py +++ b/test/cmdtest_d/ethswap.py @@ -260,7 +260,7 @@ class CmdTestEthSwap(CmdTestSwapMethods, CmdTestRegtest): trunner, add_cfg = {'eth_daemon_id': trunner.cfg.eth_daemon_id}) - self.swap_server = ThornodeSwapServer() + self.swap_server = ThornodeSwapServer(cfg) self.swap_server.start() TestProxy(self, cfg) diff --git a/test/cmdtest_d/httpd/__init__.py b/test/cmdtest_d/httpd/__init__.py index 9240d8fd..50ad4275 100755 --- a/test/cmdtest_d/httpd/__init__.py +++ b/test/cmdtest_d/httpd/__init__.py @@ -24,6 +24,9 @@ class SilentRequestHandler(WSGIRequestHandler): class HTTPD: + def __init__(self, cfg): + self.cfg = cfg + def start(self): if port_in_use(self.port): diff --git a/test/cmdtest_d/httpd/thornode/swap.py b/test/cmdtest_d/httpd/thornode/swap.py index 10ae19b6..4b5d0299 100755 --- a/test/cmdtest_d/httpd/thornode/swap.py +++ b/test/cmdtest_d/httpd/thornode/swap.py @@ -15,7 +15,6 @@ test.cmdtest_d.httpd.thornode.swap: Thornode swap HTTP server import time, re, json from wsgiref.util import request_uri -from mmgen.cfg import Config from mmgen.amt import UniAmt from mmgen.protocol import init_proto @@ -23,8 +22,6 @@ from ...include.common import eth_inbound_addr, thorchain_router_addr_file from . import ThornodeServer -cfg = Config() - # https://thornode.ninerealms.com/thorchain/quote/swap?from_asset=BCH.BCH&to_asset=LTC.LTC&amount=1000000 prices = {'BTC': 97000, 'LTC': 115, 'BCH': 330, 'ETH': 2304, 'MM1': 0.998, 'RUNE': 1.4} gas_rate_units = {'ETH': 'gwei', 'BTC': 'satsperbyte'} @@ -117,7 +114,7 @@ data_template_eth = { 'total_swap_seconds': 24 } -def make_inbound_addr(proto, mmtype): +def make_inbound_addr(cfg, proto, mmtype): if proto.is_evm: return '0x' + eth_inbound_addr # non-checksummed as per ninerealms thornode else: @@ -155,15 +152,15 @@ class ThornodeSwapServer(ThornodeServer): } if send_asset != 'RUNE': - send_proto = init_proto(cfg, send_chain, network='regtest', need_amt=True) + send_proto = init_proto(self.cfg, send_chain, network='regtest', need_amt=True) data.update({ - 'inbound_address': make_inbound_addr(send_proto, send_proto.preferred_mmtypes[0]), + 'inbound_address': make_inbound_addr(self.cfg, send_proto, send_proto.preferred_mmtypes[0]), 'gas_rate_units': gas_rate_units[send_proto.base_proto_coin], 'recommended_gas_rate': recommended_gas_rate[send_proto.base_proto_coin] }) if send_asset == 'MM1': - eth_proto = init_proto(cfg, 'eth', network='regtest') + eth_proto = init_proto(self.cfg, 'eth', network='regtest') with open(thorchain_router_addr_file) as fh: raw_addr = fh.read().strip() data['router'] = '0x' + eth_proto.checksummed_addr(raw_addr) diff --git a/test/cmdtest_d/rune.py b/test/cmdtest_d/rune.py index 5d4254ee..933887d2 100755 --- a/test/cmdtest_d/rune.py +++ b/test/cmdtest_d/rune.py @@ -70,7 +70,7 @@ class CmdTestRune(CmdTestEthdevMethods, CmdTestBase, CmdTestShared): self.proto = init_proto(cfg, network_id=self.proto.coin + '_rt', need_amt=True) self.spawn_env['MMGEN_BOGUS_SEND'] = '' - self.rpc_server = ThornodeRPCServer() + self.rpc_server = ThornodeRPCServer(cfg) self.rpc_server.start() TestProxy(self, cfg) diff --git a/test/cmdtest_d/runeswap.py b/test/cmdtest_d/runeswap.py index 57ec9451..e8e17a9f 100755 --- a/test/cmdtest_d/runeswap.py +++ b/test/cmdtest_d/runeswap.py @@ -78,7 +78,7 @@ class CmdTestRuneSwap(CmdTestSwapMethods, CmdTestRegtest): globals()[self.cross_group] = self.create_cross_runner(trunner) - self.swap_server = ThornodeSwapServer() + self.swap_server = ThornodeSwapServer(cfg) self.swap_server.start() TestProxy(self, cfg) diff --git a/test/cmdtest_d/swap.py b/test/cmdtest_d/swap.py index f3809c1e..84ce05c7 100755 --- a/test/cmdtest_d/swap.py +++ b/test/cmdtest_d/swap.py @@ -469,7 +469,7 @@ class CmdTestSwap(CmdTestSwapMethods, CmdTestRegtest, CmdTestAutosignThreaded): self.protos = [init_proto(cfg, k, network='regtest', need_amt=True) for k in ('btc', 'ltc', 'bch')] - self.swap_server = ThornodeSwapServer() + self.swap_server = ThornodeSwapServer(cfg) self.swap_server.start() self.opts.append('--bob') diff --git a/test/modtest_d/rune.py b/test/modtest_d/rune.py index 3b22fb4f..33b1d5b2 100755 --- a/test/modtest_d/rune.py +++ b/test/modtest_d/rune.py @@ -209,7 +209,7 @@ class unit_tests: regtest_cfg = Config({'coin': 'rune', 'regtest': True, 'test_suite': True}) end_silence() - thornode_server = ThornodeRPCServer() + thornode_server = ThornodeRPCServer(test_cfg) thornode_server.start() addr = 'thor1lukwlve7hayy66qrdkp4k7sh0emjqwergy7tl3'