Fix excess logging of composite swap (#1003)

DeFiCh · Dec 27, 2021 · 0035a7e · 0035a7e
1 parent bd788ba
commit 0035a7e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -3556,7 +3556,7 @@ Res CPoolSwap::ExecuteSwap(CCustomCSView& view, std::vector<DCT_ID> poolIDs) {
             }
             intermediateView.Flush();
 
-           return Res::Ok(swapAmountResult.ToString());
+           return res;
         }, static_cast<int>(height));
 
         if (!poolResult) {

diff --git a/src/masternodes/mn_checks.h b/src/masternodes/mn_checks.h
@@ -485,7 +485,7 @@ class CPoolSwap {
     std::vector<DCT_ID> CalculateSwaps(CCustomCSView& view);
     Res ExecuteSwap(CCustomCSView& view, std::vector<DCT_ID> poolIDs);
     std::vector<std::vector<DCT_ID>> CalculatePoolPaths(CCustomCSView& view);
-
+    CTokenAmount GetResult() { return CTokenAmount{obj.idTokenTo, result}; };
 };
 
 #endif // DEFI_MASTERNODES_MN_CHECKS_H
diff --git a/src/masternodes/rpc_poolpair.cpp b/src/masternodes/rpc_poolpair.cpp
@@ -1081,10 +1081,10 @@ UniValue testpoolswap(const JSONRPCRequest& request) {
                 }
                 throw JSONRPCError(RPC_INVALID_REQUEST, errorMsg);
             }
-
             for (const auto& id : poolIds) {
                 pools.push_back(id.ToString());
             }
+            res.msg = compositeSwap.GetResult().ToString();
         }
     }
     if (verbose) {