diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -265,7 +265,8 @@ tr("&Receive"), this); receiveCoinsAction->setStatusTip( tr("Request payments (generates QR codes and %1: URIs)") - .arg(GUIUtil::bitcoinURIScheme(*config))); + .arg(QString::fromStdString( + config->GetChainParams().CashAddrPrefix()))); receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip()); receiveCoinsAction->setCheckable(true); receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3)); @@ -390,8 +391,10 @@ openAction = new QAction(platformStyle->TextColorIcon(":/icons/open"), tr("Open &URI..."), this); - openAction->setStatusTip(tr("Open a %1: URI or payment request") - .arg(GUIUtil::bitcoinURIScheme(*config))); + openAction->setStatusTip( + tr("Open a %1: URI or payment request") + .arg(QString::fromStdString( + config->GetChainParams().CashAddrPrefix()))); showHelpMessageAction = new QAction(platformStyle->TextColorIcon(":/icons/info"), @@ -805,8 +808,9 @@ void BitcoinGUI::updateHeadersSyncProgressLabel() { int64_t headersTipTime = clientModel->getHeaderTipTime(); int headersTipHeight = clientModel->getHeaderTipHeight(); - int estHeadersLeft = (GetTime() - headersTipTime) / - Params().GetConsensus().nPowTargetSpacing; + int estHeadersLeft = + (GetTime() - headersTipTime) / + config->GetChainParams().GetConsensus().nPowTargetSpacing; if (estHeadersLeft > HEADER_HEIGHT_DELTA_SYNC) { progressBarLabel->setText( tr("Syncing Headers (%1%)...") diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -57,8 +57,6 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent); void setupAmountWidget(QLineEdit *widget, QWidget *parent); -QString bitcoinURIScheme(const CChainParams &, bool useCashAddr); -QString bitcoinURIScheme(const Config &); // Parse "bitcoincash:" URI into recipient object, return true on successful // parsing bool parseBitcoinURI(const QString &scheme, const QUrl &uri, diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -159,18 +159,6 @@ widget->setAlignment(Qt::AlignRight | Qt::AlignVCenter); } -QString bitcoinURIScheme(const CChainParams ¶ms, bool useCashAddr) { - if (!useCashAddr) { - return "bitcoincash"; - } - return QString::fromStdString(params.CashAddrPrefix()); -} - -QString bitcoinURIScheme(const Config &config) { - return bitcoinURIScheme(config.GetChainParams(), - config.UseCashAddrEncoding()); -} - static bool IsCashAddrEncoded(const QUrl &uri) { const std::string addr = (uri.scheme() + ":" + uri.path()).toStdString(); auto decoded = cashaddr::Decode(addr, ""); diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -188,7 +188,7 @@ static std::string ipcParseURI(const QString &arg, const CChainParams ¶ms, bool useCashAddr) { - const QString scheme = GUIUtil::bitcoinURIScheme(params, useCashAddr); + const QString scheme = QString::fromStdString(params.CashAddrPrefix()); if (!arg.startsWith(scheme + ":", Qt::CaseInsensitive)) { return {}; } diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -36,7 +36,8 @@ tr("A message that was attached to the %1 URI which will be" " stored with the transaction for your reference. Note: " "This message will not be sent over the Bitcoin network.") - .arg(GUIUtil::bitcoinURIScheme(GetConfig()))); + .arg(QString::fromStdString( + model->getChainParams().CashAddrPrefix()))); setCurrentWidget(ui->SendCoins); diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h --- a/src/qt/test/uritests.h +++ b/src/qt/test/uritests.h @@ -15,7 +15,6 @@ void uriTestsBase58(); void uriTestsCashAddr(); void uriTestFormatURI(); - void uriTestScheme(); }; #endif // BITCOIN_QT_TEST_URITESTS_H diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -202,39 +202,3 @@ "message=test"); } } - -namespace { -class UriTestConfig : public DummyConfig { -public: - UriTestConfig(bool useCashAddrIn) - : DummyConfig(CBaseChainParams::MAIN), useCashAddr(useCashAddrIn) {} - bool UseCashAddrEncoding() const override { return useCashAddr; } - -private: - bool useCashAddr; -}; - -} // namespace - -void URITests::uriTestScheme() { - { - // cashaddr - scheme depends on selected chain params - UriTestConfig config(true); - config.SetChainParams(CBaseChainParams::MAIN); - QVERIFY("bitcoincash" == GUIUtil::bitcoinURIScheme(config)); - config.SetChainParams(CBaseChainParams::TESTNET); - QVERIFY("bchtest" == GUIUtil::bitcoinURIScheme(config)); - config.SetChainParams(CBaseChainParams::REGTEST); - QVERIFY("bchreg" == GUIUtil::bitcoinURIScheme(config)); - } - { - // legacy - scheme is "bitcoincash" regardless of chain params - UriTestConfig config(false); - config.SetChainParams(CBaseChainParams::MAIN); - QVERIFY("bitcoincash" == GUIUtil::bitcoinURIScheme(config)); - config.SetChainParams(CBaseChainParams::TESTNET); - QVERIFY("bitcoincash" == GUIUtil::bitcoinURIScheme(config)); - config.SetChainParams(CBaseChainParams::REGTEST); - QVERIFY("bitcoincash" == GUIUtil::bitcoinURIScheme(config)); - } -}