Auto merge of #3136 - str4d:2937-z_importviewingkey-startheight, r=daira
Fix z_importviewingkey startHeight parameter Closes #2937. Co-authored-by: Tomas M <tomas@slax.org>
This commit is contained in:
commit
3055fd5508
|
@ -182,7 +182,7 @@ class WalletNullifiersTest (BitcoinTestFramework):
|
||||||
# add node 1 address and node 2 viewing key to node 3
|
# add node 1 address and node 2 viewing key to node 3
|
||||||
myzvkey = self.nodes[2].z_exportviewingkey(myzaddr)
|
myzvkey = self.nodes[2].z_exportviewingkey(myzaddr)
|
||||||
self.nodes[3].importaddress(mytaddr1)
|
self.nodes[3].importaddress(mytaddr1)
|
||||||
self.nodes[3].z_importviewingkey(myzvkey)
|
self.nodes[3].z_importviewingkey(myzvkey, 'whenkeyisnew', 1)
|
||||||
|
|
||||||
# Check the address has been imported
|
# Check the address has been imported
|
||||||
assert_equal(myzaddr in self.nodes[3].z_listaddresses(), False)
|
assert_equal(myzaddr in self.nodes[3].z_listaddresses(), False)
|
||||||
|
|
|
@ -653,7 +653,7 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
|
||||||
if (!EnsureWalletIsAvailable(fHelp))
|
if (!EnsureWalletIsAvailable(fHelp))
|
||||||
return NullUniValue;
|
return NullUniValue;
|
||||||
|
|
||||||
if (fHelp || params.size() < 1 || params.size() > 2)
|
if (fHelp || params.size() < 1 || params.size() > 3)
|
||||||
throw runtime_error(
|
throw runtime_error(
|
||||||
"z_importviewingkey \"vkey\" ( rescan startHeight )\n"
|
"z_importviewingkey \"vkey\" ( rescan startHeight )\n"
|
||||||
"\nAdds a viewing key (as returned by z_exportviewingkey) to your wallet.\n"
|
"\nAdds a viewing key (as returned by z_exportviewingkey) to your wallet.\n"
|
||||||
|
|
Loading…
Reference in New Issue