Skip to content

Commit 38509c5

Browse files
author
evan82
committed
Merge pull request #200 from UdjinM6/v0.11.2.x_fix_few_test
V0.11.2.x fix few test (generation/data)
2 parents 4254b86 + 248420b commit 38509c5

File tree

5 files changed

+292
-292
lines changed

5 files changed

+292
-292
lines changed

‎contrib/testgen/gen_base58_test_vectors.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
from binascii import b2a_hex
1616

1717
# key types
18-
PUBKEY_ADDRESS = 0
19-
SCRIPT_ADDRESS = 5
20-
PUBKEY_ADDRESS_TEST = 111
21-
SCRIPT_ADDRESS_TEST = 196
22-
PRIVKEY = 128
18+
PUBKEY_ADDRESS = 76
19+
SCRIPT_ADDRESS = 16
20+
PUBKEY_ADDRESS_TEST = 139
21+
SCRIPT_ADDRESS_TEST = 19
22+
PRIVKEY = 204
2323
PRIVKEY_TEST = 239
2424

2525
metadata_keys = ['isPrivkey', 'isTestnet', 'addrType', 'isCompressed']

‎src/qt/test/uritests.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,54 +9,54 @@ void URITests::uriTests()
99
{
1010
SendCoinsRecipient rv;
1111
QUrl uri;
12-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-dontexist="));
12+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-dontexist="));
1313
QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
1414

15-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?dontexist="));
15+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?dontexist="));
1616
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
17-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
17+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
1818
QVERIFY(rv.label == QString());
1919
QVERIFY(rv.amount == 0);
2020

21-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Wikipedia Example Address"));
21+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?label=Some Example Address"));
2222
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
23-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
24-
QVERIFY(rv.label == QString("Wikipedia Example Address"));
23+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
24+
QVERIFY(rv.label == QString("Some Example Address"));
2525
QVERIFY(rv.amount == 0);
2626

27-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=0.001"));
27+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=0.001"));
2828
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
29-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
29+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
3030
QVERIFY(rv.label == QString());
3131
QVERIFY(rv.amount == 100000);
3232

33-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1.001"));
33+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1.001"));
3434
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
35-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
35+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
3636
QVERIFY(rv.label == QString());
3737
QVERIFY(rv.amount == 100100000);
3838

39-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example"));
39+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=100&label=Some Example"));
4040
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
41-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
41+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
4242
QVERIFY(rv.amount == 10000000000LL);
43-
QVERIFY(rv.label == QString("Wikipedia Example"));
43+
QVERIFY(rv.label == QString("Some Example"));
4444

45-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address"));
45+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address"));
4646
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
47-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
47+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
4848
QVERIFY(rv.label == QString());
4949

50-
QVERIFY(GUIUtil::parseBitcoinURI("bitcoin://175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address", &rv));
51-
QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W"));
50+
QVERIFY(GUIUtil::parseBitcoinURI("darkcoin://XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?message=Some Example Address", &rv));
51+
QVERIFY(rv.address == QString("XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg"));
5252
QVERIFY(rv.label == QString());
5353

54-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-message=Wikipedia Example Address"));
54+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?req-message=Some Example Address"));
5555
QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv));
5656

57-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000&label=Wikipedia Example"));
57+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000&label=Some Example"));
5858
QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
5959

60-
uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=1,000.0&label=Wikipedia Example"));
60+
uri.setUrl(QString("darkcoin:XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwg?amount=1,000.0&label=Some Example"));
6161
QVERIFY(!GUIUtil::parseBitcoinURI(uri, &rv));
6262
}

‎src/test/Checkpoints_tests.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ BOOST_AUTO_TEST_SUITE(Checkpoints_tests)
1818

1919
BOOST_AUTO_TEST_CASE(sanity)
2020
{
21-
uint256 p11111 = uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d");
22-
uint256 p134444 = uint256("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe");
23-
BOOST_CHECK(Checkpoints::CheckBlock(11111, p11111));
24-
BOOST_CHECK(Checkpoints::CheckBlock(134444, p134444));
21+
uint256 p88805 = uint256("0x00000000001392f1652e9bf45cd8bc79dc60fe935277cd11538565b4a94fa85f");
22+
uint256 p217752 = uint256("0x00000000000a7baeb2148272a7e14edf5af99a64af456c0afc23d15a0918b704");
23+
BOOST_CHECK(Checkpoints::CheckBlock(88805, p88805));
24+
BOOST_CHECK(Checkpoints::CheckBlock(217752, p217752));
2525

2626

2727
// Wrong hashes at checkpoints should fail:
28-
BOOST_CHECK(!Checkpoints::CheckBlock(11111, p134444));
29-
BOOST_CHECK(!Checkpoints::CheckBlock(134444, p11111));
28+
BOOST_CHECK(!Checkpoints::CheckBlock(88805, p217752));
29+
BOOST_CHECK(!Checkpoints::CheckBlock(217752, p88805));
3030

3131
// ... but any hash not at a checkpoint should succeed:
32-
BOOST_CHECK(Checkpoints::CheckBlock(11111+1, p134444));
33-
BOOST_CHECK(Checkpoints::CheckBlock(134444+1, p11111));
32+
BOOST_CHECK(Checkpoints::CheckBlock(88805+1, p217752));
33+
BOOST_CHECK(Checkpoints::CheckBlock(217752+1, p88805));
3434

35-
BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 134444);
35+
BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate() >= 217752);
3636
}
3737

3838
BOOST_AUTO_TEST_SUITE_END()

0 commit comments

Comments
 (0)