DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Auto merge of #1523 - bitcartel:master_1504_z_logging, r=bitcartel

Browse Source 
Refine LogPrint debugging for z_* rpc calls

For #1504 ZCA011
This commit is contained in:
zkbot
2016-10-14 11:11:26 -04:00
parent 6432b8c453 438d1e45be
commit 27bc01a05b
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/rpcdump.cpp
View File

@@ -305,11 +305,11 @@ Value importwallet_impl(const Array& params, bool fHelp, bool fImportZKeys)
libzcash::SpendingKey key = spendingkey.Get();
libzcash::PaymentAddress addr = key.address();
if (pwalletMain->HaveSpendingKey(addr)) {
LogPrintf("Skipping import of zaddr %s (key already present)\n", CZCPaymentAddress(addr).ToString());
LogPrint("zrpc", "Skipping import of zaddr %s (key already present)\n", CZCPaymentAddress(addr).ToString());
continue;
}
int64_t nTime = DecodeDumpTime(vstr[1]);
LogPrintf("Importing zaddr %s...\n", CZCPaymentAddress(addr).ToString());
LogPrint("zrpc", "Importing zaddr %s...\n", CZCPaymentAddress(addr).ToString());
if (!pwalletMain->AddZKey(key)) {
// Something went wrong
fGood = false;
@@ -320,7 +320,7 @@ Value importwallet_impl(const Array& params, bool fHelp, bool fImportZKeys)
continue;
}
catch (const std::runtime_error &e) {
LogPrintf("Importing detected an error: %s\n", e.what());
LogPrint("zrpc","Importing detected an error: %s\n", e.what());
// Not a valid spending key, so carry on and see if it's a Bitcoin style address.
}
}