From d492ffd04ef7e21c1931bad930cac063de1039ae Mon Sep 17 00:00:00 2001
From: dangell7 <denisangell7@gmail.com>
Date: Fri, 20 Jan 2023 00:40:20 -0500
Subject: [PATCH] cleanup and fix rpc call test

---
 src/ripple/net/impl/RPCCall.cpp |  5 -----
 src/test/rpc/RPCCall_test.cpp   | 12 ++++++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
index 4535143b2..cec070a39 100644
--- a/src/ripple/net/impl/RPCCall.cpp
+++ b/src/ripple/net/impl/RPCCall.cpp
@@ -886,10 +886,8 @@ private:
             
             // parse string
             Json::Value amountJson = jvParseSTAmount(jvParams[index].asString());
-            // std::cout << "AMT JSON: " << amountJson << "\n";
             if (!amountJson) {
                 // amount is string
-                // std::cout << "IS STRING: " << "\n";
                 if (!to_uint64(jvParams[index].asString()))
                     return rpcError(rpcCHANNEL_AMT_MALFORMED);
                 
@@ -898,7 +896,6 @@ private:
             else
             {
                 // amount is json
-                // std::cout << "IS JSON: " << "\n";
                 STAmount amount;
                 bool isAmount = amountFromJsonNoThrow(amount, amountJson);
                 if (!isAmount)
@@ -939,7 +936,6 @@ private:
                 return rpcError(rpcCHANNEL_AMT_MALFORMED);
             // parse string
             Json::Value amountJson = jvParseSTAmount(jvParams[2u].asString());
-            // std::cout << "AMT JSON: " << amountJson << "\n";
             if (!amountJson) {
                 // amount is string
                 if (!to_uint64(jvParams[2u].asString()))
@@ -960,7 +956,6 @@ private:
         }
 
         jvRequest[jss::signature] = jvParams[3u].asString();
-
         return jvRequest;
     }
 
diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp
index b80bd075b..3f55c982c 100644
--- a/src/test/rpc/RPCCall_test.cpp
+++ b/src/test/rpc/RPCCall_test.cpp
@@ -2036,9 +2036,9 @@ static RPCCallTestData const rpcCallTestArray[] = {
       {
          "api_version" : %MAX_API_VER%,
          "amount" : {
-            "value: "1000",
-            "currency: "USD",
-            "issuer: "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"
+            "currency" : "USD",
+            "issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
+            "value" : "1000"
          },
          "channel_id" : "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
          "secret" : "secret_can_be_anything"
@@ -2222,9 +2222,9 @@ static RPCCallTestData const rpcCallTestArray[] = {
       {
          "api_version" : %MAX_API_VER%,
          "amount" : {
-            "value: "1000",
-            "currency: "USD",
-            "issuer: "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA"
+            "currency" : "USD",
+            "issuer" : "rnUy2SHTrB9DubsPmkJZUXTf5FcNDGrYEA",
+            "value" : "1000"
          },
          "channel_id" : "0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF",
          "public_key" : "aB4BXXLuPu8DpVuyq1DBiu3SrPdtK9AYZisKhu8mvkoiUD8J9Gov",