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

ryanofsky · ryanofsky · commit e49f0394f07a · 2017-02-16T15:14:53.000-05:00
Add missing response.setArray call and fix string formatting issue pointed out #9773 (comment)
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -1083,6 +1083,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
         if (!scannedRange || scannedRange->nHeight > pindex->nHeight) {
             std::vector<UniValue> results = response.getValues();
             response.clear();
+            response.setArray();
             size_t i = 0;
             for (const UniValue& request : requests.getValues()) {
                 // If key creation date is within the successfully scanned
@@ -1094,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.", (long long)scannedRange->GetBlockTimeMax())));
+                    result.pushKV("error", JSONRPCError(RPC_MISC_ERROR, strprintf("Failed to rescan before time %" PRId64 ", transactions may be missing.", scannedRange->GetBlockTimeMax())));
                     response.push_back(std::move(result));
                 }
             }
