Update SkaleAllocator configuration

skalenetwork · Mar 29, 2024 · ac8b20e · ac8b20e
1 parent a48397c
commit ac8b20e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/skale/utils/helper.py b/skale/utils/helper.py
@@ -105,6 +105,10 @@ def get_skale_manager_address(abi_filepath: string = None) -> str:
     return get_abi(abi_filepath)['skale_manager_address']
 
 
+def get_allocator_address(abi_filepath: string = None) -> str:
+    return get_abi(abi_filepath)['allocator_address']
+
+
 def generate_nonce():  # pragma: no cover
     return randint(0, 65534)
 

diff --git a/tests/allocator/provision_contracts.py b/tests/allocator/provision_contracts.py
@@ -3,7 +3,7 @@
 from skale import SkaleAllocator, SkaleManager
 from skale.wallets import Web3Wallet
 from skale.utils.web3_utils import init_web3
-from skale.utils.helper import get_skale_manager_address, init_default_logger
+from skale.utils.helper import get_allocator_address, get_skale_manager_address, init_default_logger
 from skale.utils.contracts_provision.allocator import transfer_tokens_to_allocator, add_test_plan
 from skale.utils.contracts_provision.main import setup_validator, add_test_permissions
 from tests.constants import (ENDPOINT, TEST_ABI_FILEPATH, ETH_PRIVATE_KEY,
@@ -14,7 +14,7 @@ def init_libs():
     web3 = init_web3(ENDPOINT)
     wallet = Web3Wallet(ETH_PRIVATE_KEY, web3)
     return (SkaleManager(ENDPOINT, get_skale_manager_address(TEST_ABI_FILEPATH), wallet),
-            SkaleAllocator(ENDPOINT, TEST_ALLOCATOR_ABI_FILEPATH, wallet))
+            SkaleAllocator(ENDPOINT, get_allocator_address(TEST_ALLOCATOR_ABI_FILEPATH), wallet))
 
 
 def provision_contracts():

diff --git a/tests/allocator/skale_allocator_test.py b/tests/allocator/skale_allocator_test.py
@@ -1,6 +1,7 @@
 """ SKALE Allocator test """
 
 from skale import SkaleAllocator
+from skale.utils.helper import get_allocator_address
 from skale.wallets import Web3Wallet
 from skale.utils.web3_utils import init_web3
 from tests.constants import ENDPOINT, TEST_ALLOCATOR_ABI_FILEPATH, ETH_PRIVATE_KEY
@@ -9,8 +10,12 @@
 def test_init_allocator():
     web3 = init_web3(ENDPOINT)
     wallet = Web3Wallet(ETH_PRIVATE_KEY, web3)
-    skale_allocator = SkaleAllocator(ENDPOINT, TEST_ALLOCATOR_ABI_FILEPATH, wallet,
-                                     provider_timeout=20)
+    skale_allocator = SkaleAllocator(
+        ENDPOINT,
+        get_allocator_address(TEST_ALLOCATOR_ABI_FILEPATH),
+        wallet,
+        provider_timeout=20
+    )
     assert len(skale_allocator._SkaleBase__contracts) == 1
     assert skale_allocator.allocator
     assert skale_allocator.escrow

diff --git a/tests/helper.py b/tests/helper.py
@@ -7,7 +7,7 @@
 from web3 import Web3
 
 from skale import SkaleManager, SkaleAllocator
-from skale.utils.helper import get_abi, get_skale_manager_address
+from skale.utils.helper import get_allocator_address, get_skale_manager_address
 from skale.wallets import Web3Wallet
 from tests.constants import (ENDPOINT, TEST_ABI_FILEPATH,
                              TEST_ALLOCATOR_ABI_FILEPATH,
@@ -42,8 +42,7 @@ def init_skale_allocator(
     test_allocator_abi_filepath: str = TEST_ALLOCATOR_ABI_FILEPATH
 ) -> SkaleAllocator:
     wallet = Web3Wallet(eth_private_key, web3)
-    allocator_address = get_abi(test_allocator_abi_filepath)['allocator_address']
-    return SkaleAllocator(ENDPOINT, allocator_address, wallet)
+    return SkaleAllocator(ENDPOINT, get_allocator_address(test_allocator_abi_filepath), wallet)
 
 
 @contextmanager