Updated test cases, Updated wallet model, Fixed payouts and refunds

Author: ppatidar2021

src/bitpay/models/payout/payout.py

@@ -46,7 +46,8 @@ class Payout:
 
     def __init__(self, amount=None, currency=None, ledger_currency=None, **kwargs):
         self.set_amount(amount)
-        self.set_currency(currency)
+        if currency:
+            self.set_currency(currency)
         if ledger_currency:
             self.set_ledger_currency(ledger_currency)
 

src/bitpay/models/payout/payout_batch.py

@@ -47,8 +47,9 @@ class PayoutBatch:
     def __init__(
         self, currency=None, effective_date=None, ledger_currency=None, **kwargs
     ):
-        self.set_currency(currency)
         self.set_effective_date(effective_date)
+        if currency:
+            self.set_currency(currency)
         if ledger_currency:
             self.set_ledger_currency(ledger_currency)
 

src/bitpay/models/wallet/currencies.py

@@ -23,7 +23,7 @@ def __init__(self, **kwargs):
         for key, value in kwargs.items():
             try:
                 if key in ["qr"]:
-                    klass = globals()[key[0].upper() + key[1:]]
+                    klass = CurrencyQr if key == "qr" else globals()[key[0].upper() + key[1:]]
                     value = klass(**value)
                 getattr(
                     self, "set_%s" % key_utils.change_camel_case_to_snake_case(key)

src/bitpay/utils/rest_cli.py

@@ -49,7 +49,6 @@ def post(self, uri, form_data, signature_required=True):
         """
         full_url = self.__baseurl + uri
         form_data = json.dumps(form_data)
-
         if signature_required:
             self.__headers["x-signature"] = sign(full_url + form_data, self.__eckey)
             self.__headers["x-identity"] = get_compressed_public_key_from_pem(self.__eckey)
@@ -114,7 +113,7 @@ def update(self, uri, form_data):
         return json_response
 
     def response_to_json_string(self, response):
-        if not response:
+        if not response.json():
             raise BitPayException("Error: HTTP response is null")
 
         response_obj = response.json()

tests/test_bitpay.py

@@ -140,7 +140,7 @@ def test_should_create_get_cancel_refund_request_new(self):
         )
         first_invoice = invoices[0]
         create_refund = self.client.create_refund(
-            first_invoice.get_id(), 1.0, "BTC", True, False, False
+            first_invoice.get_id(), first_invoice.get_price(), first_invoice.get_currency(), True, False, False
         )
         retrieved_refunds = self.client.get_refunds(first_invoice.get_id())
         last_refund = retrieved_refunds[-1]
@@ -150,15 +150,17 @@ def test_should_create_get_cancel_refund_request_new(self):
             last_refund.get_id()
         )
         cancel_refund = self.client.cancel_refund(last_refund.get_id())
-        supported_wallets = self.client.get_supported_wallets()
 
         self.assertIsNotNone(invoices)
         self.assertIsNotNone(create_refund.get_id())
         self.assertIsNotNone(retrieved_refunds)
         self.assertEqual("created", update_refund.get_status())
         self.assertEqual(last_refund.get_id(), retrieved_refund.get_id())
         self.assertTrue(notification_status)
-        self.assertEqual("cancelled", cancel_refund.get_status())
+        self.assertEqual("canceled", cancel_refund.get_status())
+
+    def test_should_get_supported_wallets(self):
+        supported_wallets = self.client.get_supported_wallets()
         self.assertIsNotNone(supported_wallets)
 
     def test_should_create_bill_usd(self):
@@ -417,7 +419,7 @@ def test_should_get_payout_recipient_id(self):
         recipients_list = []
 
         payout_recipient = PayoutRecipient()
-        payout_recipient.set_email("sandbox@bitpay.com")
+        payout_recipient.set_email("nsoni@mailinator.com")
         payout_recipient.set_label("recipient1")
         payout_recipient.set_notification_url("https://hookb.in/QJOPBdMgRkukpp2WO60o")
         recipients_list.append(payout_recipient)
@@ -489,7 +491,7 @@ def test_should_request_payout_recipient_notification(self):
     def test_should_submit_payout(self):
         recipients = self.client.get_payout_recipients(None, 1)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
 
         payout = Payout(5.0, currency, ledger_currency)
         payout.set_recipient_id(recipients[0].get_id())
@@ -511,7 +513,7 @@ def test_should_get_payouts_by_status(self):
     def test_should_submit_get_and_delete_payout(self):
         recipients = self.client.get_payout_recipients(None, 1)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
 
         payout = Payout(5.0, currency, ledger_currency)
         payout.set_recipient_id(recipients[0].get_id())
@@ -529,7 +531,7 @@ def test_should_submit_get_and_delete_payout(self):
     def test_should_request_payout_notification(self):
         recipients = self.client.get_payout_recipients(None, 1)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
 
         payout = Payout(5.0, currency, ledger_currency)
         payout.set_recipient_id(recipients[0].get_id())
@@ -547,16 +549,16 @@ def test_should_request_payout_notification(self):
         self.assertTrue(cancel_payout)
 
     def test_should_submit_payout_batch(self):
-        recipients = self.client.get_payout_recipients(None, 2)
+        recipients = self.client.get_payout_recipients("active", 2)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
         effective_date = (date.today() + timedelta(days=3)).strftime("%Y-%m-%d")
         instructions = [
             PayoutInstruction(
                 5.0, RecipientReferenceMethod.EMAIL, recipients[0].get_email()
             ),
             PayoutInstruction(
-                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_email()
+                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_id()
             ),
         ]
         batch = PayoutBatch(currency, effective_date, ledger_currency)
@@ -569,17 +571,17 @@ def test_should_submit_payout_batch(self):
         self.assertTrue(cancel_batch)
 
     def test_should_submit_get_and_delete_payout_batch(self):
-        recipients = self.client.get_payout_recipients(None, 2)
+        recipients = self.client.get_payout_recipients("active", 2)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
         effective_date = (date.today() + timedelta(days=3)).strftime("%Y-%m-%d")
 
         instructions = [
             PayoutInstruction(
                 5.0, RecipientReferenceMethod.EMAIL, recipients[0].get_email()
             ),
             PayoutInstruction(
-                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_email()
+                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_id()
             ),
         ]
         batch = PayoutBatch(currency, effective_date, ledger_currency)
@@ -597,17 +599,17 @@ def test_should_submit_get_and_delete_payout_batch(self):
         self.assertEqual(PayoutStatus.New, retrieve_batch.get_status())
 
     def test_should_request_payout_batch_notification(self):
-        recipients = self.client.get_payout_recipients(None, 2)
+        recipients = self.client.get_payout_recipients("active", 2)
         currency = Currency.USD
-        ledger_currency = Currency.ETH
+        ledger_currency = Currency.USD
         effective_date = (date.today() + timedelta(days=3)).strftime("%Y-%m-%d")
 
         instructions = [
             PayoutInstruction(
                 5.0, RecipientReferenceMethod.EMAIL, recipients[0].get_email()
             ),
             PayoutInstruction(
-                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_email()
+                6.0, RecipientReferenceMethod.RECIPIENT_ID, recipients[1].get_id()
             ),
         ]
         batch = PayoutBatch(currency, effective_date, ledger_currency)