Merge pull request #152 from neonlabsorg/NDEV-2257

Ndev 2257

contracts/common/StorageSoliditySource.sol

@@ -23,3 +23,13 @@ contract Storage {
         return number;
     }
 }
+
+contract StorageMultipleVars {
+    string public data = "test";
+    uint256 constant public number = 1;
+    uint256 public notSet;
+
+    function setData(string memory _data) public  {
+        data = _data;
+    }
+}

integration/tests/basic/helpers/basic.py

@@ -176,6 +176,12 @@ def wait_finalized_block(self, block_num: int):
             response = self.proxy_api.send_rpc("neon_finalizedBlockNumber", [])
             fin_block_num = int(response["result"], 16)
 
+    def make_contract_tx_object(self, sender=None, amount=0, estimate_gas=False) -> tp.Dict:
+        """Can be used with build_transaction method"""
+        if sender is None:
+            sender = self.sender_account.address
+        return super().create_tx_object(sender, recipient=None, amount=amount, estimate_gas=estimate_gas)
+
     def create_tx_object(self, sender=None, recipient=None, amount=2, nonce=None, gas=None, gas_price=None, data=None,
                          estimate_gas=True):
         if sender is None:

integration/tests/basic/helpers/errors.py

@@ -0,0 +1,16 @@
+class Error32000:
+    CODE = -32000
+    MISSING_ARGUMENT = "missing 1 required positional argument"
+
+
+class Error32600:
+    CODE = -32600
+    INVALID_FILTER = "invalid filter"
+
+
+class Error32602:
+    CODE = -32602
+    NOT_HEX = "is not hex"
+    BAD_BLOCK_HASH = "bad block hash"
+    BAD_ADDRESS = "bad address"
+    BAD_TOPIC = "bad topic"

integration/tests/basic/helpers/rpc_checks.py

@@ -15,6 +15,17 @@ def is_hex(hex_data: str) -> bool:
         return False
 
 
+def hex_str_consists_not_only_of_zeros(hex_data: str) -> bool:
+    """Helps to verify that long response hex str data is not consists of just zeros"""
+    t = hex_data
+    if t.startswith("0x"):
+        t = hex_data.split("0x")[1]
+    for c in t:
+        if c != "0":
+            return True
+    return False
+
+
 def assert_block_fields(block: dict, full_trx: bool, tx_receipt: tp.Optional[types.TxReceipt],
                         pending: bool = False):
     assert "error" not in block
@@ -110,10 +121,22 @@ def assert_fields_are_boolean(object, expected_boolean_fields):
         assert type(object[field]) == bool, f"field {field} is not boolean. Actual : {type(object[field])}"
 
 
-def assert_equal_fields(response, receipt, comparable_fields):
+def assert_equal_fields(result, comparable_object, comparable_fields, keys_mappings=None):
+    """
+    Assert that fields in the result object are equal to fields in comparable_object
+
+    :param result:
+    :param comparable_object:
+    :param comparable_fields: list of comparable fields
+    :param keys_mappings: map name of the field in the result object to the field in comparable_object
+    :return:
+    """
     for field in comparable_fields:
-        l = response["result"][0][field]
-        r = receipt["logs"][0][field]
+        l = result[field]
+        if keys_mappings and keys_mappings.get(field):
+            r = comparable_object[keys_mappings.get(field)]
+        else:
+            r = comparable_object[field]
         if isinstance(r, str):
             r = r.lower()
         if isinstance(r, int):