Improve rpc

defichain/node/RPCErrorHandler.py

@@ -24,6 +24,11 @@ def __init__(self, response, logger: Logger):
                 if logger:
                     self.logger.error("NodeError", f"Unauthorized")
                 raise Unauthorized()
+            if self.statusCode == 503:
+                if logger:
+                    self.logger.error("NodeError", f"ServiceUnavailable: "
+                                                   f"The service you are trying to connect to is not available")
+                raise ServiceUnavailable("The service you are trying to connect to is not available")
             else:
                 self.response_text = response.json()
                 if 'error' in self.response_text and self.response_text['error'] is not None:
@@ -50,7 +55,3 @@ def __init__(self, response, logger: Logger):
                         if logger:
                             self.logger.error("NodeError", f"InternalServerError: {rpc_name}: {msg}")
                         raise InternalServerError(f"{rpc_name}: {msg}")
-                    if self.statusCode == 503:
-                        if logger:
-                            self.logger.error("NodeError", f"ServiceUnavailable: {rpc_name}: {msg}")
-                        raise ServiceUnavailable(f"{rpc_name}: {msg}")

defichain/node/node.py

@@ -81,6 +81,8 @@ def __init__(self, user: str, password: str, url: str = "127.0.0.1", port: int =
 
         # Setup all different modules
         self._rpc = RPC(self.url, logger)
+        self._logger = logger
+
         self.accounts = Accounts(self)
         self.blockchain = Blockchain(self)
         self.control = Control(self)
@@ -156,7 +158,9 @@ def test_connection(self):
         try:
             self.network.ping()
         except ServiceUnavailable as e:
-            raise ServiceUnavailable(f"RPC_CLIENT_INVALID_IP_OR_SUBNET: Invalid IP/Subnet {e}")
+            if self._logger:
+                self._logger.error("ConnectionError", f"RPC_CLIENT_INVALID_IP_OR_SUBNET: Invalid IP/Subnet")
+            raise ServiceUnavailable(f"RPC_CLIENT_INVALID_IP_OR_SUBNET: Invalid IP/Subnet")
 
         except Exception as e:
             raise Exception(e)

defichain/node/rpc.py

@@ -6,6 +6,9 @@
 from defichain.exceptions.http.ServiceUnavailable import ServiceUnavailable
 
 
+RPC_TIMEOUT = 60
+
+
 class RPC(object):
     def __init__(self, url, logger: Logger):
         self._session = requests.Session()
@@ -26,18 +29,26 @@ def call(self, rpc_method, *params):
         # Logging of Node get request url
         if self._logger:
             if self._logger.log_level == "input" or self._logger.log_level == "all":
-                self._logger.input("NodeInput", f"Node request URL: {self._url} | Headers: {self._headers} | Payload: {payload}")
+                self._logger.input("NodeInput", f"Node request URL: {self._url} | Headers: {self._headers} | Payload: "
+                                                f"{payload}")
 
         while True:
             try:
-                response = self._session.post(self._url, headers=self._headers, data=payload)
+                response = self._session.post(self._url, headers=self._headers, data=payload, timeout=RPC_TIMEOUT)
             except requests.exceptions.ConnectionError as e:
                 tries -= 1
                 if tries == 0:
-                    raise ServiceUnavailable(e)
+                    raise ServiceUnavailable("The service you are trying to connect to is not available")
                 hadFailedConnections = True
-                print(f"Couldn't connect for remote procedure call, will sleep for five seconds and then try again ({tries} more tries)")
+                print(f"Couldn't connect for remote procedure call, will sleep for five seconds and then try again "
+                      f"({tries} more tries)")
+                if self._logger:
+                    self._logger.error("ConnectionError", f"Could not connect to the Node, trying again")
                 time.sleep(5)
+            except requests.exceptions.ReadTimeout as e:
+                if self._logger:
+                    self._logger.error("ConnectionError", f"The connection timed out: {e}")
+
             else:
                 if hadConnectionFailures:
                     print('Connected for remote procedure call after retry.')

tests/check_setup.py

@@ -1,7 +1,7 @@
 import time
 
 from defichain import Ocean
-from tests.util import createNode
+from tests.node import node
 from tests.util import load_secrets_conf
 
 """
@@ -21,11 +21,11 @@
 DFI_AMOUNT = 0.01
 VAULT_MIN_RATIO = 400
 
-node = createNode()
 ocean = Ocean()
 ADDRESS = load_secrets_conf()["wallet_address"]
 VAULT = load_secrets_conf()["vault_address"]
 
+
 # All needed functions
 def check_min_and_max_utxo():
     balance = float(node.wallet.getbalances()["mine"]["trusted"])

tests/node/test_accounts.py

@@ -14,14 +14,17 @@
 
 @pytest.mark.query
 def test_accounthistorycount():  # 01
-    assert node.accounts.accounthistorycount(address)
-    assert node.accounts.accounthistorycount(address, True, "DFI", "")
-    assert node.accounts.accounthistorycount(owner=address, no_rewards=True, token="DFI", txtype="")
+    result1 = node.accounts.accounthistorycount(address)
+    assert result1 or result1 == 0
+    result2 = node.accounts.accounthistorycount(address, False, "DFI", "")
+    assert result2 or result2 == 0
+    result3 =  node.accounts.accounthistorycount(owner=address, no_rewards=False, token="DFI", txtype="")
+    assert result3 or result3 == 0
 
 
 @pytest.mark.transactions
 def test_accounttoaccount():  # 02
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.accounttoaccount(address, {address: "0.0001@DUSD"})) == LENGTH_OF_TXID
@@ -31,7 +34,7 @@ def test_accounttoaccount():  # 02
 
 @pytest.mark.transactions
 def test_accounttoutxos():  # 03
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.accounttoutxos(address, {address: "0.00001000"})) == LENGTH_OF_TXID
@@ -52,7 +55,7 @@ def test_executesmartcontract():  # 04
 
 @pytest.mark.transactions
 def test_futureswap():  # 05
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.futureswap(address, "0.00000001@DUSD", "SPY")) == LENGTH_OF_TXID
@@ -103,10 +106,13 @@ def test_gettokenbalances():  # 11
 @pytest.mark.query
 def test_listaccounthistory():  # 12
     blockcount = node.blockchain.getblockcount()
-    assert node.accounts.listaccounthistory(address)
-    assert node.accounts.listaccounthistory(address, blockcount, 10000000, True, "", "", 100, 0)
-    assert node.accounts.listaccounthistory(owner=address, maxBlockHeight=blockcount, depth=10000000, no_rewards=True,
-                                            token="", txtype="", limit=100, txn=0)
+    result1 = node.accounts.listaccounthistory(address)
+    assert result1 or result1 == []
+    result2 = node.accounts.listaccounthistory(address, blockcount, 10000000, True, "", "", 100, 0)
+    assert result2 or result2 == []
+    result3 = node.accounts.listaccounthistory(owner=address, maxBlockHeight=blockcount, depth=10000000,
+                                               no_rewards=True, token="", txtype="", limit=100, txn=0)
+    assert result3 or result3 == []
 
 
 @pytest.mark.query
@@ -144,7 +150,7 @@ def test_listpendingfutureswaps():  # 17
 
 @pytest.mark.transactions
 def test_sendtokenstoaddress():  # 18
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.sendtokenstoaddress({address: "0.0001@DUSD"}, {address: "0.0001@DUSD"})) == LENGTH_OF_TXID
@@ -155,7 +161,7 @@ def test_sendtokenstoaddress():  # 18
 
 @pytest.mark.transactions
 def test_sendutxosfrom():  # 19
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.sendutxosfrom(address, address, 0.001)) == LENGTH_OF_TXID
@@ -165,7 +171,7 @@ def test_sendutxosfrom():  # 19
 
 @pytest.mark.transactions
 def test_utxostoaccount():  # 20
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.accounts.utxostoaccount({address: "0.000001@DFI"})) == LENGTH_OF_TXID
@@ -175,7 +181,7 @@ def test_utxostoaccount():  # 20
 
 @pytest.mark.transactions
 def test_withdrawfutureswap():  # 21
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     string = ".* RPC_INVALID_REQUEST: Test DFIP2203Tx execution failed:\namount 0.00000000 is less than 1.00000000"

tests/node/test_exceptions.py

@@ -52,7 +52,7 @@ def test_NotFound():  # 05
 @pytest.mark.query
 def test_ServiceUnavailable():  # 06
     response.status_code = 503
-    string = "ServiceUnavailable(503): RPC_INVALID_REQUEST: Das ist ein Test"
+    string = "ServiceUnavailable(503): The service you are trying to connect to is not available"
     with pytest.raises(Exception, match=re.escape(string)):
         assert RPCErrorHandler(response, logger)
 

tests/node/test_loan.py

@@ -13,7 +13,7 @@
 
 @pytest.mark.transactions
 def test_createloanscheme():  # 01
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     string = ".* RPC_INVALID_REQUEST: Test LoanSchemeTx execution failed:\ntx not from foundation member!"
@@ -27,7 +27,7 @@ def test_createloanscheme():  # 01
 
 @pytest.mark.transactions
 def test_destroyloanscheme():  # 02
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     string = ".* RPC_INVALID_REQUEST: Test DestroyLoanSchemeTx execution failed:\ntx not from foundation member!"
@@ -87,7 +87,7 @@ def test_listloantokens():  # 10
 
 @pytest.mark.transactions
 def test_paybackloan():  # 11
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     amounts = ["0.00000001@SPY", "0.00000001@SPY"]
@@ -135,7 +135,7 @@ def test_setloantoken():  # 14
 
 @pytest.mark.transactions
 def test_takeloan():  # 15
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     amounts = ["0.00000002@SPY", "0.00000002@SPY"]

tests/node/test_masternodes.py

@@ -41,9 +41,9 @@ def test_getmasternode():  # 04
 
 @pytest.mark.query
 def test_getmasternodeblocks():  # 05
-    mn_id = "e54d0814d406317dfaa38f365471ff59fb7f7725769c0aecf3d0830a59de0100"
-    ownerAddress = "8TirqFLz1Gm6uPVthQdfxh4sp84CLgnHBy"
-    operatorAddress = "8V1DZnQaFRgKY9GPkvcXt1WjcsjGx7ApWM"
+    mn_id = "f02de244dfc9e64412a8ff5ca518e806dd65bd896ab62e85e77996981cb36c04"
+    ownerAddress = "8UNfA7MdNLTRsbzBP6Qm9N7HWoLHeNLB8n"
+    operatorAddress = "8TGDAfyR21MQNVVqvaiL6bq9Xt4TxeTuSy"
     depth = 1000000
     assert node.masternodes.getmasternodeblocks(mn_id)
     assert node.masternodes.getmasternodeblocks(id=mn_id)

tests/node/test_poolpair.py

@@ -13,7 +13,7 @@
 
 @pytest.mark.transactions
 def test_addpoolliquidity():  # 01
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     dusd_pool = node.poolpair.getpoolpair(17)
@@ -31,7 +31,7 @@ def test_addpoolliquidity():  # 01
 
 @pytest.mark.transactions
 def test_compositeswap():  # 02
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert node.poolpair.compositeswap(address, "DFI", 0.00000001, address, "DUSD")
@@ -76,7 +76,7 @@ def test_listpoolshares():  # 06
 
 @pytest.mark.transactions
 def test_poolswap():  # 07
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert node.poolpair.poolswap(address, "DFI", 0.00000001, address, "DUSD")
@@ -87,7 +87,7 @@ def test_poolswap():  # 07
 
 @pytest.mark.transactions
 def test_removepoolliquidityy():  # 08
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert node.poolpair.removepoolliquidity(address, "0.00000001@DUSD-DFI")

tests/node/test_proposals.py

@@ -72,13 +72,13 @@ def test_votegov():  # 06
     with pytest.raises(InternalServerError, match=string):
         assert node.proposals.votegov("df925903d16ddcde1c10062b20f990a2f653002d37fe9633daf978a45bd7c612",
                                       "e54d0814d406317dfaa38f365471ff59fb7f7725769c0aecf3d0830a59de0100",
-                                      "neutral")
+                                      "yes")
     with pytest.raises(InternalServerError, match=string):
         assert node.proposals.votegov("df925903d16ddcde1c10062b20f990a2f653002d37fe9633daf978a45bd7c612",
                                       "e54d0814d406317dfaa38f365471ff59fb7f7725769c0aecf3d0830a59de0100",
-                                      "neutral", [])
+                                      "yes", [])
     with pytest.raises(InternalServerError, match=string):
         assert node.proposals.votegov(proposalId="df925903d16ddcde1c10062b20f990a2f653002d37fe9633daf978a45bd7c612",
                                       masternodeId="e54d0814d406317dfaa38f365471ff59fb7f7725769c0aecf3d0830a59de0100",
-                                      decision="neutral",
+                                      decision="yes",
                                       inputs=[])

tests/node/test_tokens.py

@@ -14,7 +14,9 @@ def test_burntokens():  # 01
     string = ".* RPC_INVALID_ADDRESS_OR_KEY: Incorrect authorization for 8N9gJZFTYrempWvr13f5SR9X3PNJBCwU5U"
     with pytest.raises(InternalServerError, match=string):
         assert node.tokens.burntokens("1@BTC", "8N9gJZFTYrempWvr13f5SR9X3PNJBCwU5U")
+    with pytest.raises(InternalServerError):
         assert node.tokens.burntokens("1@BTC", "8N9gJZFTYrempWvr13f5SR9X3PNJBCwU5U", "Context", [])
+    with pytest.raises(InternalServerError):
         assert node.tokens.burntokens(amounts="1@BTC", _from="8N9gJZFTYrempWvr13f5SR9X3PNJBCwU5U", context="Context",
                                       inputs=[])
 

tests/node/test_vaults.py

@@ -37,7 +37,7 @@ def test_createvault():  # 02
 
 @pytest.mark.transactions
 def test_deposittovault():  # 03
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.vault.deposittovault(vault, address, "0.00000001@DUSD")) == LENGTH_OF_TXID
@@ -74,13 +74,16 @@ def test_getvault():  # 07
 
 @pytest.mark.query
 def test_listauctionhistory():  # 08
-    assert node.vault.listauctionhistory() == []
-    assert node.vault.listauctionhistory("mine", node.blockchain.getblockcount(),
-                                         "63a41dbc6497a58f024b730ca27189cdd2da45a5f9adda78c02581de36345e18",
-                                         0, 100) == []
-    assert node.vault.listauctionhistory(identifier="all", maxBlockHeight=node.blockchain.getblockcount(),
-                                         vaultId="63a41dbc6497a58f024b730ca27189cdd2da45a5f9adda78c02581de36345e18",
-                                         index=0, limit=100) == []
+    result1 = node.vault.listauctionhistory()
+    assert result1 == [] or result1
+    result2 = node.vault.listauctionhistory("mine", node.blockchain.getblockcount(),
+                                            "63a41dbc6497a58f024b730ca27189cdd2da45a5f9adda78c02581de36345e18",
+                                            0, 100)
+    assert result2 == [] or result2
+    result3 = node.vault.listauctionhistory(identifier="all", maxBlockHeight=node.blockchain.getblockcount(),
+                                            vaultId="63a41dbc6497a58f024b730ca27189cdd2da45a5f9adda78c02581de36345e18",
+                                            index=0, limit=100)
+    assert result3 == [] or result3
 
 
 @pytest.mark.query
@@ -131,7 +134,7 @@ def test_placeauctionbid():  # 13
 
 @pytest.mark.transactions
 def test_updatevault():  # 14
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.vault.updatevault(vault, address)) == LENGTH_OF_TXID
@@ -144,7 +147,7 @@ def test_updatevault():  # 14
 
 @pytest.mark.transactions
 def test_withdrawfromvault():  # 15
-    while len(node.wallet.listunspent()) < 1:
+    while len(node.wallet.listunspent()) < 3:
         time.sleep(1)
 
     assert len(node.vault.withdrawfromvault(vault, address, "0.00000001@DUSD")) == LENGTH_OF_TXID

tests/node/test_wallet.py

@@ -423,8 +423,9 @@ def test_signrawtransactionwithwallet():  # 49
 
 @pytest.mark.query
 def test_unloadwallet():  # 50
-    assert node.wallet.unloadwallet() is None
-    node.wallet.loadwallet(load_secrets_conf()["wallet_name"])
+    pass
+    #assert node.wallet.unloadwallet() is None
+    #node.wallet.loadwallet(load_secrets_conf()["wallet_name"])
 
 
 @pytest.mark.query