add/fix some tests for {list,get}receivedby{address,account}

Author: AkioNak

qa/rpc-tests/confidential_transactions.py

@@ -107,7 +107,7 @@ def run_test(self):
         assert_equal(self.nodes[2].getbalance()["bitcoin"], node2)
 
         # Check 2's listreceivedbyaddress
-        received_by_address = self.nodes[2].listreceivedbyaddress()
+        received_by_address = self.nodes[2].listreceivedbyaddress(0, False, False, "bitcoin")
         validate_by_address = [(unconfidential_address2, value1 + value3), (unconfidential_address, value0 + value2)]
         assert_equal(sorted([(ele['address'], ele['amount']) for ele in received_by_address], key=lambda t: t[0]),
                 sorted(validate_by_address, key = lambda t: t[0]))
@@ -131,7 +131,7 @@ def run_test(self):
         assert_equal(list_unspent[0]['amount']+list_unspent[1]['amount'], value1+value3)
         received_by_address = self.nodes[1].listreceivedbyaddress(1, False, True)
         assert_equal(len(received_by_address), 1)
-        assert_equal((received_by_address[0]['address'], received_by_address[0]['amount']),
+        assert_equal((received_by_address[0]['address'], received_by_address[0]['amount']['bitcoin']),
                      (unconfidential_address2, value1 + value3))
 
         # Spending a single confidential output and sending it to a
@@ -365,6 +365,16 @@ def run_test(self):
         assert_equal(self.nodes[0].getwalletinfo()["balance"][issued["token"]], 1)
 
 
+        # Check for value when receiving defferent assets by same address.
+        self.nodes[0].sendtoaddress(unconfidential_address2, Decimal('0.00000001'), "", "", False, test_asset)
+        self.nodes[0].sendtoaddress(unconfidential_address2, Decimal('0.00000002'), "", "", False, test_asset)
+        self.nodes[0].generate(1)
+        self.sync_all()
+        received_by_address = self.nodes[1].listreceivedbyaddress(0, False, True)
+        multi_asset_amount = [x for x in received_by_address if x['address'] == unconfidential_address2][0]['amount']
+        assert_equal(multi_asset_amount['bitcoin'], value1 + value3 )
+        assert_equal(multi_asset_amount[test_asset], Decimal('0.00000003'))
+
         # Check blinded multisig functionality
         # Get two pubkeys
         blinded_addr = self.nodes[0].getnewaddress()

qa/rpc-tests/receivedby.py

@@ -56,11 +56,11 @@ def run_test(self):
         self.sync_all()
         assert_array_result(self.nodes[1].listreceivedbyaddress(),
                            {"address":unblinded},
-                           {"address":unblinded, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
+                           {"address":unblinded, "account":"", "amount":{"bitcoin":Decimal("0.1")}, "confirmations":10, "txids":[txid,]})
         #With min confidence < 10
         assert_array_result(self.nodes[1].listreceivedbyaddress(5),
                            {"address":unblinded},
-                           {"address":unblinded, "account":"", "amount":Decimal("0.1"), "confirmations":10, "txids":[txid,]})
+                           {"address":unblinded, "account":"", "amount":{"bitcoin":Decimal("0.1")}, "confirmations":10, "txids":[txid,]})
         #With min confidence > 10, should not find Tx
         assert_array_result(self.nodes[1].listreceivedbyaddress(11),{"blindedaddress":addr},{ },True)
 
@@ -69,7 +69,7 @@ def run_test(self):
         unblinded = self.nodes[1].validateaddress(addr)['unconfidential']
         assert_array_result(self.nodes[1].listreceivedbyaddress(0,True),
                            {"address":unblinded},
-                           {"address":unblinded, "account":"", "amount":0, "confirmations":0, "txids":[]})
+                           {"address":unblinded, "account":"", "amount":{}, "confirmations":0, "txids":[]})
 
         '''
             getreceivedbyaddress Test
@@ -106,7 +106,7 @@ def run_test(self):
         received_by_account_json = get_sub_array_from_array(self.nodes[1].listreceivedbyaccount(),{"account":account})
         if len(received_by_account_json) == 0:
             raise AssertionError("No accounts found in node")
-        balance_by_account = self.nodes[1].getreceivedbyaccount(account)
+        balance_by_account = self.nodes[1].getreceivedbyaccount(account)["bitcoin"]
 
         txid = self.nodes[0].sendtoaddress(addr, 0.1)
         self.sync_all()
@@ -117,7 +117,7 @@ def run_test(self):
                            received_by_account_json)
 
         # getreceivedbyaddress should return same balance because of 0 confirmations
-        balance = self.nodes[1].getreceivedbyaccount(account)
+        balance = self.nodes[1].getreceivedbyaccount(account)["bitcoin"]
         if balance != balance_by_account:
             raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
 
@@ -126,10 +126,10 @@ def run_test(self):
         # listreceivedbyaccount should return updated account balance
         assert_array_result(self.nodes[1].listreceivedbyaccount(),
                            {"account":account},
-                           {"account":received_by_account_json["account"], "amount":(received_by_account_json["amount"] + Decimal("0.1"))})
+                           {"account":received_by_account_json["account"], "amount":{"bitcoin":(received_by_account_json["amount"]["bitcoin"] + Decimal("0.1"))}})
 
         # getreceivedbyaddress should return updates balance
-        balance = self.nodes[1].getreceivedbyaccount(account)
+        balance = self.nodes[1].getreceivedbyaccount(account)["bitcoin"]
         if balance != balance_by_account + Decimal("0.1"):
             raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
 
@@ -140,12 +140,12 @@ def run_test(self):
             raise AssertionError("No accounts found in node")
 
         # Test includeempty of listreceivedbyaccount
-        if received_by_account_json["amount"] != Decimal("0.0"):
+        if received_by_account_json["amount"] != {}:
             raise AssertionError("Wrong balance returned by listreceivedbyaccount, %0.2f"%(received_by_account_json["amount"]))
 
         # Test getreceivedbyaccount for 0 amount accounts
         balance = self.nodes[1].getreceivedbyaccount("mynewaccount")
-        if balance != Decimal("0.0"):
+        if balance != {}:
             raise AssertionError("Wrong balance returned by getreceivedbyaccount, %0.2f"%(balance))
 
 if __name__ == '__main__':