diff --git a/src/qt/test/bitcoinaddressvalidatortests.cpp b/src/qt/test/bitcoinaddressvalidatortests.cpp index f749cbc29..a82ae174c 100644 --- a/src/qt/test/bitcoinaddressvalidatortests.cpp +++ b/src/qt/test/bitcoinaddressvalidatortests.cpp @@ -1,54 +1,56 @@ // Copyright (c) 2017 The Bitcoin Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/test/bitcoinaddressvalidatortests.h" -#include "chainparams.h" -#include "qt/bitcoinaddressvalidator.h" +#include +#include + +#include + #include void BitcoinAddressValidatorTests::inputTests() { const auto params = CreateChainParams(CBaseChainParams::MAIN); const std::string prefix = params->CashAddrPrefix(); BitcoinAddressEntryValidator v(prefix, nullptr); int unused = 0; QString in; // Empty string is intermediate. in = ""; QVERIFY(v.validate(in, unused) == QValidator::Intermediate); // invalid base58 because of I, invalid cashaddr, currently considered valid // anyway. in = "BIIC"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, invalid cashaddr, currently considered valid anyway. in = "BITCOINCASHH"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58 because of I, but could be a cashaddr prefix in = "BITC"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr in = "BITCOINCASH:QP"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr, lower case in = "bitcoincash:qp"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // invalid base58, valid cashaddr, mixed case in = "bItCoInCaSh:Qp"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // valid base58, invalid cash in = "BBBBBBBBBBBBBB"; QVERIFY(v.validate(in, unused) == QValidator::Acceptable); // Only alphanumeric chars are accepted. in = "%"; QVERIFY(v.validate(in, unused) == QValidator::Invalid); } diff --git a/src/qt/test/compattests.cpp b/src/qt/test/compattests.cpp index fea1dce5b..3d50525e2 100644 --- a/src/qt/test/compattests.cpp +++ b/src/qt/test/compattests.cpp @@ -1,22 +1,21 @@ // Copyright (c) 2016 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "paymentrequestplus.h" // this includes protobuf's port.h which defines its own bswap macos +#include -#include "compattests.h" - -#include "compat/byteswap.h" +#include +#include // this includes protobuf's port.h which defines its own bswap macos void CompatTests::bswapTests() { // Sibling in bitcoin/src/test/bswap_tests.cpp uint16_t u1 = 0x1234; uint32_t u2 = 0x56789abc; uint64_t u3 = 0xdef0123456789abc; uint16_t e1 = 0x3412; uint32_t e2 = 0xbc9a7856; uint64_t e3 = 0xbc9a78563412f0de; QVERIFY(bswap_16(u1) == e1); QVERIFY(bswap_32(u2) == e2); QVERIFY(bswap_64(u3) == e3); } diff --git a/src/qt/test/guiutiltests.cpp b/src/qt/test/guiutiltests.cpp index 0b6491d5f..cd6aaf2cd 100644 --- a/src/qt/test/guiutiltests.cpp +++ b/src/qt/test/guiutiltests.cpp @@ -1,65 +1,66 @@ // Copyright (c) 2017 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "guiutiltests.h" -#include "chainparams.h" -#include "config.h" -#include "dstencode.h" -#include "guiutil.h" +#include + +#include +#include +#include +#include namespace { class GUIUtilTestConfig : public DummyConfig { public: GUIUtilTestConfig() : DummyConfig(CBaseChainParams::MAIN), useCashAddr(false) {} void SetCashAddrEncoding(bool b) override { useCashAddr = b; } bool UseCashAddrEncoding() const override { return useCashAddr; } private: bool useCashAddr; }; } // namespace void GUIUtilTests::dummyAddressTest() { GUIUtilTestConfig config; const CChainParams ¶ms = config.GetChainParams(); std::string dummyaddr; config.SetCashAddrEncoding(false); dummyaddr = GUIUtil::DummyAddress(config); QVERIFY(!IsValidDestinationString(dummyaddr, params)); QVERIFY(!dummyaddr.empty()); config.SetCashAddrEncoding(true); dummyaddr = GUIUtil::DummyAddress(config); QVERIFY(!IsValidDestinationString(dummyaddr, params)); QVERIFY(!dummyaddr.empty()); } void GUIUtilTests::toCurrentEncodingTest() { GUIUtilTestConfig config; // garbage in, garbage out QVERIFY(GUIUtil::convertToConfiguredAddressFormat(config, "garbage") == "garbage"); QString cashaddr_pubkey = "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a"; QString base58_pubkey = "1BpEi6DfDAUFd7GtittLSdBeYJvcoaVggu"; config.SetCashAddrEncoding(true); QVERIFY(GUIUtil::convertToConfiguredAddressFormat( config, cashaddr_pubkey) == cashaddr_pubkey); QVERIFY(GUIUtil::convertToConfiguredAddressFormat(config, base58_pubkey) == cashaddr_pubkey); config.SetCashAddrEncoding(false); QVERIFY(GUIUtil::convertToConfiguredAddressFormat( config, cashaddr_pubkey) == base58_pubkey); QVERIFY(GUIUtil::convertToConfiguredAddressFormat(config, base58_pubkey) == base58_pubkey); } diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 35704139b..3ca880d1e 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -1,221 +1,221 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "paymentservertests.h" - -#include "optionsmodel.h" -#include "paymentrequestdata.h" - -#include "amount.h" -#include "interfaces/node.h" -#include "random.h" -#include "script/script.h" -#include "script/standard.h" -#include "util.h" -#include "utilstrencodings.h" +#include + +#include +#include +#include +#include +#include