Fixing RPC tests

firoorg · Dec 23, 2020 · 3a79943 · 3a79943
1 parent 7f61976
commit 3a79943
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/qa/rpc-tests/lelantus_mintspend.py b/qa/rpc-tests/lelantus_mintspend.py
@@ -20,17 +20,16 @@ def run_test(self):
         start_bal = self.nodes[0].getbalance()
 
         mint_trans = list()
-        coin = 100000000;
         mint_trans.append(self.nodes[0].mintlelantus(1))
         mint_trans.append(self.nodes[0].mintlelantus(2))
 
         # Get last added transaction and fee for it
-        info = self.nodes[0].gettransaction(mint_trans[-1])
+        info = self.nodes[0].gettransaction(mint_trans[-1][0])
 
         # fee in transaction is negative
         fee = -(info['fee'] * 2)
         cur_bal = self.nodes[0].getbalance()
-        start_bal = float(start_bal) - float(fee) - coin * 3
+        start_bal = float(start_bal) - float(fee) - 3
         start_bal = Decimal(format(start_bal, '.8f'))
 
         assert start_bal == cur_bal, \
@@ -40,7 +39,7 @@ def run_test(self):
         # confirmations should be i due to less than 4 blocks was generated after transactions send
         for i in range(5):
             for tr in mint_trans:
-                info = self.nodes[0].gettransaction(tr)
+                info = self.nodes[0].gettransaction(tr[0])
                 confrms = info['confirmations']
                 assert confrms == i, \
                     'Confirmations should be {}, ' \
@@ -51,7 +50,7 @@ def run_test(self):
                 assert tr_type == 'mint', 'Unexpected transaction type: {}'.format(tr_type)
 
             res = False
-            args = {'THAYjKnnCsN5xspnEcb1Ztvw4mSPBuwxzU': coin}
+            args = {'THAYjKnnCsN5xspnEcb1Ztvw4mSPBuwxzU': 1}
             try:
                 res = self.nodes[0].joinsplit(args)
             except JSONRPCException as ex:
@@ -67,7 +66,7 @@ def run_test(self):
         self.sync_all()
 
         for tr in mint_trans:
-            info = self.nodes[0].gettransaction(tr)
+            info = self.nodes[0].gettransaction(tr[0])
             confrms = info['confirmations']
             assert confrms == 6, \
                 'Confirmations should be 6, ' \
@@ -86,8 +85,8 @@ def run_test(self):
         total_spend_fee = 0
 
         myaddr = self.nodes[0].listreceivedbyaddress(0, True)[0]['address']
-        print(coin)
-        args = {myaddr: coin}
+        print(1)
+        args = {myaddr: 1}
 
         spend_trans.append(self.nodes[0].joinsplit(args))
 
@@ -97,7 +96,7 @@ def run_test(self):
         total_spend_fee += -info['fee']
         print(info['fee'])
         print(self.nodes[0].getbalance())
-        spend_total = float(spend_total) + coin
+        spend_total = float(spend_total) + 1
         assert confrms == 0, \
             'Confirmations should be 0, ' \
             'due to 0 blocks was generated after transaction was created,' \

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2032,12 +2032,11 @@ UniValue gettransaction(const JSONRPCRequest& request)
     CAmount nDebit = wtx.GetDebit(filter);
     CAmount nNet = nCredit - nDebit;
     CAmount nFee = (wtx.IsFromMe(filter) ? wtx.tx->GetValueOut() - nDebit : 0);
+    if (wtx.tx->vin[0].IsLelantusJoinSplit())
+        nFee = (0 - lelantus::ParseLelantusJoinSplit(wtx.tx->vin[0])->getFee());
 
     entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
 
-    if (wtx.tx->vin[0].IsLelantusJoinSplit())
-        nFee = lelantus::ParseLelantusJoinSplit(wtx.tx->vin[0])->getFee();
-
     if (wtx.IsFromMe(filter))
         entry.push_back(Pair("fee", ValueFromAmount(nFee)));