Created
October 4, 2016 17:42
-
-
Save bitcartel/bef16bfd2ac9fe4ea6d3da7c06f6156c to your computer and use it in GitHub Desktop.
patch so tests pass
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py | |
index f0f7c8c..7f9541f 100755 | |
--- a/qa/rpc-tests/wallet.py | |
+++ b/qa/rpc-tests/wallet.py | |
@@ -233,10 +233,7 @@ class WalletTest (BitcoinTestFramework): | |
assert_equal(self.nodes[2].z_getbalance(mytaddr), Decimal('10.0')); | |
# add zaddr to node 2 | |
- # payment address: tneMWwNSjPkPaz7p5ed3XJbrz8XwpfBvaha3jaGU26EstNN8HKMYVyzgwMmVcmtaw7b5uuaF4Hr8P4UPZEMkuTkXQa8STzF | |
- # spending key: TKWRfN47drnaFDbHBSYT2McbPjbmFjjTrGuntj3tAMnnGDg2Kp19 | |
- self.nodes[2].z_importkey("TKWRfN47drnaFDbHBSYT2McbPjbmFjjTrGuntj3tAMnnGDg2Kp19") | |
- myzaddr = "tneMWwNSjPkPaz7p5ed3XJbrz8XwpfBvaha3jaGU26EstNN8HKMYVyzgwMmVcmtaw7b5uuaF4Hr8P4UPZEMkuTkXQa8STzF" | |
+ myzaddr = self.nodes[2].z_getnewaddress() | |
# send node 2 taddr to zaddr | |
recipients = [] | |
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp | |
index c13e240..5a4bd3a 100644 | |
--- a/src/test/rpc_wallet_tests.cpp | |
+++ b/src/test/rpc_wallet_tests.cpp | |
@@ -805,7 +805,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters) | |
BOOST_CHECK( find_error(objError, "payment address is invalid")); | |
} | |
- // This test is for testnet addresses which begin with 't' not 'z'. | |
+ // Testnet payment addresses begin with 'zt'. This test detects an incorrect prefix. | |
try { | |
std::vector<SendManyRecipient> recipients = { SendManyRecipient("dummy",1.0, "") }; | |
std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany("zcMuhvq8sEkHALuSU2i4NbNQxshSAYrpCExec45ZjtivYPbuiFPwk6WHy4SvsbeZ4siy1WheuRGjtaJmoD1J8bFqNXhsG6U", recipients, {}, 1) ); | |
@@ -817,7 +817,7 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters) | |
// invokes a method on pwalletMain, which is undefined in the google test environment. | |
try { | |
std::vector<SendManyRecipient> recipients = { SendManyRecipient("dummy",1.0, "") }; | |
- std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany("tnpoQJVnYBZZqkFadj2bJJLThNCxbADGB5gSGeYTAGGrT5tejsxY9Zc1BtY8nnHmZkBUkJ1oSfbhTJhm72WiZizvkZz5aH1", recipients, {}, 1) ); | |
+ std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany("ztjiDe569DPNbyTE6TSdJTaSDhoXEHLGvYoUnBU1wfVNU52TEyT6berYtySkd21njAeEoh8fFJUT42kua9r8EnhBaEKqCpP", recipients, {}, 1) ); | |
} catch (const Object& objError) { | |
BOOST_CHECK( find_error(objError, "no spending key found for zaddr")); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment