diff --git a/src/amount.cpp b/src/amount.cpp --- a/src/amount.cpp +++ b/src/amount.cpp @@ -17,7 +17,7 @@ static const Currency XEC{100 * SATOSHI, SATOSHI, 2, "XEC"}; const Currency &Currency::get() { - return gArgs.GetBoolArg("-xec", DEFAULT_XEC) ? XEC : BCHA; + return gArgs.GetBoolArg("-ecash", DEFAULT_ECASH) ? XEC : BCHA; } std::string Amount::ToString() const { diff --git a/src/currencyunit.h b/src/currencyunit.h --- a/src/currencyunit.h +++ b/src/currencyunit.h @@ -8,7 +8,6 @@ class ArgsManager; constexpr bool DEFAULT_ECASH = false; -constexpr bool DEFAULT_XEC = false; void SetupCurrencyUnitOptions(ArgsManager &argsman); diff --git a/src/currencyunit.cpp b/src/currencyunit.cpp --- a/src/currencyunit.cpp +++ b/src/currencyunit.cpp @@ -9,12 +9,7 @@ void SetupCurrencyUnitOptions(ArgsManager &argsman) { // whether to use eCash default unit and address prefix argsman.AddArg("-ecash", - strprintf("Use the ecash CashAddr prefixes (default: %s)", + strprintf("Use the eCash prefixes and units (default: %s)", DEFAULT_ECASH ? "true" : "false"), ArgsManager::ALLOW_BOOL, OptionsCategory::OPTIONS); - // whether to use eCash default unit (XEC) - argsman.AddArg("-xec", - strprintf("Use XEC as default unit (default: %s)", - DEFAULT_XEC ? "true" : "false"), - ArgsManager::ALLOW_BOOL, OptionsCategory::OPTIONS); } diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -38,7 +38,7 @@ // clang-format on static const unitNameMap &getUnitsAtRuntime() { - return gArgs.GetBoolArg("-xec", DEFAULT_XEC) ? xecUnits : bchUnits; + return gArgs.GetBoolArg("-ecash", DEFAULT_ECASH) ? xecUnits : bchUnits; } BitcoinUnits::BitcoinUnits(QObject *parent) diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -100,7 +100,6 @@ "-debugexclude=libevent", "-debugexclude=leveldb", "-ecash", - "-xec" }, extra_args); // clang-format on diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -109,7 +109,6 @@ "-uacomment=" + self.name, "-noprinttoconsole", "-ecash", - "-xec" ] if use_valgrind: