Test add missing tests + fix index filtering listauctionhistory (#1215)

Co-authored-by: Jouzo <[email protected]>
DeFiCh · Jun 2, 2022 · a47808b · a47808b
1 parent 67a4534
commit a47808b
Show file tree

Hide file tree

Showing 5 changed files with 461 additions and 216 deletions.
diff --git a/src/masternodes/rpc_vault.cpp b/src/masternodes/rpc_vault.cpp
@@ -524,15 +524,13 @@ UniValue listvaults(const JSONRPCRequest& request) {
         if (!including_start)
         {
             including_start = true;
-            return (true);
-        }
-        if (!ownerAddress.empty() && ownerAddress != data.ownerAddress) {
-            return false;
+            return true;
         }
         auto vaultState = GetVaultState(vaultId, data);
 
         if ((loanSchemeId.empty() || loanSchemeId == data.schemeId)
-        && (state == VaultState::Unknown || state == vaultState)) {
+        &&  (ownerAddress.empty() || ownerAddress == data.ownerAddress)
+        &&  (state == VaultState::Unknown || state == vaultState)) {
             UniValue vaultObj{UniValue::VOBJ};
             if(!verbose){
                 vaultObj.pushKV("vaultId", vaultId.GetHex());
@@ -1156,7 +1154,7 @@ UniValue listauctionhistory(const JSONRPCRequest& request) {
 
     // parse pagination
     size_t limit = 100;
-    AuctionHistoryKey start = {~0u};
+    AuctionHistoryKey start = {~0u, {}, {}, ~0u};
     {
         if (request.params.size() > 1) {
             UniValue paginationObj = request.params[1].get_obj();
@@ -1208,6 +1206,10 @@ UniValue listauctionhistory(const JSONRPCRequest& request) {
             return true;
         }
 
+        if (start.index!=~0u && start.index != key.index){
+            return true;
+        }
+
         ret.push_back(auctionhistoryToJSON(key, valueLazy.get()));
 
         return --limit != 0;