From d02c9936ef7504e70b07e82401042ae5fc58901a Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Wed, 22 Oct 2025 10:33:16 +0000 Subject: [PATCH] mmnode-ticker: fix market cap sort with USD row --- mmgen_node_tools/Ticker.py | 1 + mmgen_node_tools/data/version | 2 +- test/cmdtest_d/misc.py | 26 +++++++++++++++++++++++++- test/ref/ticker/ticker-cfg-usd.yaml | 11 +++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 test/ref/ticker/ticker-cfg-usd.yaml diff --git a/mmgen_node_tools/Ticker.py b/mmgen_node_tools/Ticker.py index 4b49b44..15e0e9c 100755 --- a/mmgen_node_tools/Ticker.py +++ b/mmgen_node_tools/Ticker.py @@ -539,6 +539,7 @@ def gen_data(data): 'percent_change_7d': 0.0, 'percent_change_30d': 0.0, 'percent_change_1y': 0.0, + 'market_cap': 0, 'last_updated': None}) def cache_data(data_src, no_overwrite=False): diff --git a/mmgen_node_tools/data/version b/mmgen_node_tools/data/version index 47203f7..bd10d35 100644 --- a/mmgen_node_tools/data/version +++ b/mmgen_node_tools/data/version @@ -1 +1 @@ -3.6.dev9 +3.6.dev10 diff --git a/test/cmdtest_d/misc.py b/test/cmdtest_d/misc.py index 9112f48..d5cb51d 100755 --- a/test/cmdtest_d/misc.py +++ b/test/cmdtest_d/misc.py @@ -101,6 +101,9 @@ class CmdTestScripts(CmdTestBase): ('ticker30', 'ticker [--cached-data --wide --pchg-unit=btc --sort=d] (cf with config file)'), ('ticker31', 'ticker [--cached-data --wide --pchg-unit=usd] (cf with no USD)'), ('ticker32', 'ticker [--cached-data --wide --pchg-unit=gc=f]'), + ('ticker33', 'ticker [--cached-data --wide --pchg-unit=btc --sort=c] (cfg file with USD)'), + ('ticker34', 'ticker [--cached-data --wide --pchg-unit=btc --sort=y] (cfg file with USD)'), + ('ticker35', 'ticker [--cached-data --wide --pchg-unit=btc --sort=p] (cfg file with USD)'), ) } @@ -475,4 +478,25 @@ class CmdTestScripts(CmdTestBase): 'GOLD', r'\+0.00', r'\+0.00', r'\+0.00', r'\+0.00', 'SILVER' ], - add_opts = ['--widest', '--pchg-unit=gc=f']) + add_opts = ['--widest', '--pchg-unit=gc=f', '--sort=c']) + + def _ticker_cur(self, sort): + self.copy_file('ticker-cfg-usd.yaml', 'ticker-cfg.yaml') + t = self.ticker( + [], + [ + 'BITCOIN 23,250.77 1.00000000 \+0.00', + 'US DOLLAR 1.00 0.00004301 -15.93', + ], + add_opts = ['--widest', '--pchg-unit=btc', f'--sort={sort}']) + self.rm_file('ticker-cfg.yaml') + return t + + def ticker33(self): + return self._ticker_cur(sort='c') + + def ticker34(self): + return self._ticker_cur(sort='y') + + def ticker35(self): + return self._ticker_cur(sort='p') diff --git a/test/ref/ticker/ticker-cfg-usd.yaml b/test/ref/ticker/ticker-cfg-usd.yaml new file mode 100644 index 0000000..c31f85f --- /dev/null +++ b/test/ref/ticker/ticker-cfg-usd.yaml @@ -0,0 +1,11 @@ +assets: + coin1: + - btc-bitcoin + - eth-ethereum + - xmr-monero + commodity: + - gc=f + - si=f + currency: + - usd-us-dollar + - eurusd=x