aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2012-08-07 19:19:14 +0200
committerMatt Corallo <matt@bluematt.me>2012-08-07 19:37:02 +0200
commit2bc15836bead1d5bdb8eca2db2525a9643cc4d0f (patch)
tree191b6fd4b6826de3eadc06bfe4b866a29222f2ec
parent319236afa221b571b372d3a1eee4a635f9b53976 (diff)
Fix Qt test cases by moving address checks to parseBitcoinURI
Makes sense in case bitcoin URIs eventually allow invalid addresses as a part of some larger future payment scheme.
-rw-r--r--src/qt/guiutil.cpp6
-rw-r--r--src/qt/sendcoinsdialog.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 558eff6d5d..d2d7716dbd 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -4,7 +4,6 @@
#include "bitcoinunits.h"
#include "util.h"
#include "init.h"
-#include "base58.h"
#include <QString>
#include <QDateTime>
@@ -81,11 +80,6 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
if(uri.scheme() != QString("bitcoin"))
return false;
- // check if the address is valid
- CBitcoinAddress addressFromUri(uri.path().toStdString());
- if (!addressFromUri.IsValid())
- return false;
-
SendCoinsRecipient rv;
rv.address = uri.path();
rv.amount = 0;
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 2c46ea5a70..789681ad90 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -7,6 +7,7 @@
#include "sendcoinsentry.h"
#include "guiutil.h"
#include "askpassphrasedialog.h"
+#include "base58.h"
#include <QMessageBox>
#include <QLocale>
@@ -273,6 +274,9 @@ bool SendCoinsDialog::handleURI(const QString &uri)
// URI has to be valid
if (GUIUtil::parseBitcoinURI(uri, &rv))
{
+ CBitcoinAddress address(rv.address.toStdString());
+ if (!address.IsValid())
+ return false;
pasteEntry(rv);
return true;
}