fixup! Return errors from importmulti if complete rescans are not successful

ryanofsky · ryanofsky · commit aaaf65a90b87 · 2017-02-17T07:16:03.000-05:00
Avoid PRId64 as requested #9773 (comment)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -1095,7 +1095,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
                 } else {
                     UniValue result = UniValue(UniValue::VOBJ);
                     result.pushKV("success", UniValue(false));
-                    result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %" PRId64 ", transactions may be missing.", scannedRange->GetBlockTimeMax())));
+                    result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %d, transactions may be missing.", scannedRange->GetBlockTimeMax())));
                     response.push_back(std::move(result));
                 }
             }
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -411,7 +411,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
         request.params.push_back(keys);
 
         UniValue response = importmulti(request);
-        BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %" PRId64 ", transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
+        BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)`
`1095`	`1095`	`} else {`
`1096`	`1096`	`UniValue result = UniValue(UniValue::VOBJ);`
`1097`	`1097`	`result.pushKV("success", UniValue(false));`
`1098`		`- result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %" PRId64 ", transactions may be missing.", scannedRange->GetBlockTimeMax())));`
	`1098`	`+ result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %d, transactions may be missing.", scannedRange->GetBlockTimeMax())));`
`1099`	`1099`	`response.push_back(std::move(result));`
`1100`	`1100`	`}`
`1101`	`1101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)`
`411`	`411`	`request.params.push_back(keys);`
`412`	`412`
`413`	`413`	`UniValue response = importmulti(request);`
`414`		`- BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %" PRId64 ", transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));`
	`414`	`+ BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`