BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert b_ to t_ in base58 test values, will revisit

This commit is contained in:
Jon Layton 2018-02-26 19:22:19 -05:00
parent 334c1a5395
commit 390697e04e
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtest/test_miner.cpp
View File

@ -49,7 +49,7 @@ TEST(Miner, GetMinerScriptPubKey) {
EXPECT_FALSE((bool) scriptPubKey);
// Partial address
mapArgs["-mineraddress"] = "b1T8yaLVhNqxA5KJcmiqq";
mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqq";
#ifdef ENABLE_WALLET
scriptPubKey = GetMinerScriptPubKey(reservekey);
#else
@ -58,7 +58,7 @@ TEST(Miner, GetMinerScriptPubKey) {
EXPECT_FALSE((bool) scriptPubKey);
// Typo in address
mapArgs["-mineraddress"] = "b1TByaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
mapArgs["-mineraddress"] = "t1TByaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
#ifdef ENABLE_WALLET
scriptPubKey = GetMinerScriptPubKey(reservekey);
#else
@ -72,7 +72,7 @@ TEST(Miner, GetMinerScriptPubKey) {
CScript expectedScriptPubKey = CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
// Valid address
mapArgs["-mineraddress"] = "b1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF";
#ifdef ENABLE_WALLET
scriptPubKey = GetMinerScriptPubKey(reservekey);
#else
@ -92,7 +92,7 @@ TEST(Miner, GetMinerScriptPubKey) {
EXPECT_EQ(expectedScriptPubKey, *scriptPubKey);
// Valid address with trailing whitespace
mapArgs["-mineraddress"] = "b1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF ";
mapArgs["-mineraddress"] = "t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF ";
#ifdef ENABLE_WALLET
scriptPubKey = GetMinerScriptPubKey(reservekey);
#else

14
src/test/data/base58_keys_valid.json
View File

@ -1,6 +1,6 @@
[
[
"b1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF",
"t1T8yaLVhNqxA5KJcmiqqFN88e8DNp2PBfF",
"65a16059864a2fdbc7c99a4723a8395bc6f188eb",
{
"addrType": "pubkey",
@ -72,7 +72,7 @@
}
],
[
"b1TpfguJj5zxKUfWcsNTrh6eod2XXsTKtvB",
"t1TpfguJj5zxKUfWcsNTrh6eod2XXsTKtvB",
"6d23156cbbdcc82a5a47eee4c2c7c583c18b6bf4",
{
"addrType": "pubkey",
@ -144,7 +144,7 @@
}
],
[
"b1UxCT4RrCbGH36etfQaPF1svNtZVhsqs5A",
"t1UxCT4RrCbGH36etfQaPF1svNtZVhsqs5A",
"7987ccaa53d02c8873487ef919677cd3db7a6912",
{
"addrType": "pubkey",
@ -216,7 +216,7 @@
}
],
[
"b1ZiM4oLF7hvboF4LPqhbBg7RLgJCCJC6Tj",
"t1ZiM4oLF7hvboF4LPqhbBg7RLgJCCJC6Tj",
"adc1cc2081a27206fae25792f28bbc55b831549d",
{
"addrType": "pubkey",
@ -288,7 +288,7 @@
}
],
[
"b1boxWWuUs3dVUFeUMiPqCdwD4QtL1AMx9G",
"t1boxWWuUs3dVUFeUMiPqCdwD4QtL1AMx9G",
"c4c1b72491ede1eedaca00618407ee0b772cad0d",
{
"addrType": "pubkey",
@ -360,7 +360,7 @@
}
],
[
"b1SWDbHDTatR1ag8yTFLdVWd1erfu7Pbbjk",
"t1SWDbHDTatR1ag8yTFLdVWd1erfu7Pbbjk",
"5eadaf9bb7121f0f192561a5a62f5e5f54210292",
{
"addrType": "pubkey",
@ -432,7 +432,7 @@
}
],
[
"b1Lgcj4m5r7eDWctWQM7ete85hHivQxMjBZ",
"t1Lgcj4m5r7eDWctWQM7ete85hHivQxMjBZ",
"1ed467017f043e91ed4c44b4e8dd674db211c4e6",
{
"addrType": "pubkey",

12
src/test/key_tests.cpp
View File

@ -25,13 +25,13 @@ static const string strSecret1 ("5HxWvvfubhXpYYpS3tJkw6fq9jE9j18THftkZjHHfmF
static const string strSecret2 ("5KC4ejrDjv152FGwP386VD1i2NYc5KkfSMyv1nGy1VGDxGHqVY3");
static const string strSecret1C ("Kwr371tjA9u2rFSMZjTNun2PXXP3WPZu2afRHTcta6KxEUdm1vEw");
static const string strSecret2C ("L3Hq7a8FEQwJkW1M2GNKDW28546Vp5miewcCzSqUD9kCAXrJdS3g");
static const CBitcoinAddress addr1 ("b1h8SqgtM3QM5e2M8EzhhT1yL2PXXtA6oqe");
static const CBitcoinAddress addr2 ("b1Xxa5ZVPKvs9bGMn7aWTiHjyHvR31XkUst");
static const CBitcoinAddress addr1C("b1ffus9J1vhxvFqLoExGBRPjE7BcJxiSCTC");
static const CBitcoinAddress addr2C("b1VJL2dPUyXK7avDRGqhqQA5bw2eEMdhyg6");
static const CBitcoinAddress addr1 ("t1h8SqgtM3QM5e2M8EzhhT1yL2PXXtA6oqe");
static const CBitcoinAddress addr2 ("t1Xxa5ZVPKvs9bGMn7aWTiHjyHvR31XkUst");
static const CBitcoinAddress addr1C("t1ffus9J1vhxvFqLoExGBRPjE7BcJxiSCTC");
static const CBitcoinAddress addr2C("t1VJL2dPUyXK7avDRGqhqQA5bw2eEMdhyg6");
static const string strAddressBad("b1aMkLwU1LcMZYN7TgXUJAwzA1r44dbLkSp");
static const string strAddressBad("t1aMkLwU1LcMZYN7TgXUJAwzA1r44dbLkSp");
#ifdef KEY_TESTS_DUMPINFO
@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(zc_address_test)
string addr_string = paymentaddr.ToString();
BOOST_CHECK(addr_string[0] == 'z');
BOOST_CHECK(addr_string[1] == 'c');
BOOST_CHECK(addr_string[1] == 'k');
CZCPaymentAddress paymentaddr2(addr_string);