Browse Source

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.
0.8
Matt Corallo 13 years ago committed by Matt Corallo
parent
commit
2bc15836be
  1. 6
      src/qt/guiutil.cpp
  2. 4
      src/qt/sendcoinsdialog.cpp

6
src/qt/guiutil.cpp

@ -4,7 +4,6 @@ @@ -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) @@ -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;

4
src/qt/sendcoinsdialog.cpp

@ -7,6 +7,7 @@ @@ -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) @@ -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;
}

Loading…
Cancel
Save