test: minor python fixes (#185)

Author: omri-ba-starkware

devnet_tests/conftest.py

@@ -109,8 +109,9 @@
 PERPETUALS_CONTRACT_ADDRESS = 0x062DA0780FAE50D68CECAA5A051606DC21217BA290969B302DB4DD99D2E9B470
 OPERATOR_ADDRESS = 0x048DDC53F41523D2A6B40C3DFF7F69F4BBAC799CD8B2E3FC50D3DE1D4119441F
 UPGRADE_GOVERNOR_ADDRESS = 0x0562BBB386BB3EF6FFB94878EC77C0779487F277DEA89568F1CD7CDF958EDDE7
-APP_GOVERNOR_ADDRESS = 0x3CCFFE0137EA21294C1CC28F6C29DD495F5B9F1101EC86AE53EF51178AEFA2
-GOVERNANCE_ADMIN_ADDRESS = 0x522E5BA327BFBD85138B29BDE060A5340A460706B00AE2E10E6D2A16FBF8C57
+APP_GOVERNOR_ADDRESS = 0x003CCFFE0137EA21294C1CC28F6C29DD495F5B9F1101EC86AE53EF51178AEFA2
+# Extended governance admin is also app role admin
+GOVERNANCE_ADMIN_ADDRESS = 0x0522E5BA327BFBD85138B29BDE060A5340A460706B00AE2E10E6D2A16FBF8C57
 RICH_USDC_HOLDER_ADDRESS = 0x054A6DF48915BE451CD6650C3697C5789B934EB2A89D90CBB71E3234F24F0311
 
 

devnet_tests/perpetuals_test_utils.py

@@ -26,7 +26,7 @@
 
 # Required for hash computations.
 ORDER_ARGS_HASH = 0x36DA8D51815527CABFAA9C982F564C80FA7429616739306036F1F9B608DD112
-WITHDEAW_ARGS_HASH = 0x250A5FA378E8B771654BD43DCB34844534F9D1E29E16B14760D7936EA7F4B1D
+WITHDRAW_ARGS_HASH = 0x250A5FA378E8B771654BD43DCB34844534F9D1E29E16B14760D7936EA7F4B1D
 INVEST_REDEEM_VAULT_ARGS_HASH = 0x03C79B3B5997E78A29AB2FB5E8BC8244F222C5E01AE914C10F956BD0F805199A
 TRANSFER_ARGS_HASH = 0x1DB88E2709FDF2C59E651D141C3296A42B209CE770871B40413EA109846A3B4
 STARKNET_DOMAIN_HASH = 0x1FF2F602E42168014D405A94F75E8A93D640751D71D16311266E140D8B0A210
@@ -503,13 +503,14 @@ async def process_vault_invest_deposit(
         depositer_address = self.perpetuals_contract_address
         await self.__process_deposit(depositer_address, asset_id, position_id, amount, salt)
 
-    async def withdraw(self, account: Account, amount: int, expiration: int):
+    async def withdraw(self, account: Account, amount: int):
+        expiration = self.now_timestamp + WEEK_IN_SECONDS
         salt = random.randint(0, MAX_UINT32)
         collateral_asset_id = await self.get_collateral_asset_id()
 
         signature = self.sign_message(
             account,
-            WITHDEAW_ARGS_HASH,
+            WITHDRAW_ARGS_HASH,
             [
                 self.get_account_address(account),
                 self.get_account_position_id(account),

devnet_tests/system_test.py

@@ -109,8 +109,7 @@ async def test_deposit_withdraw(test_utils: PerpetualsTestUtils):
 
     # Test withdraw
     withdraw_amount = 5
-    expiration = 3765971800  # Some future timestamp
-    await test_utils.withdraw(account, withdraw_amount, expiration)
+    await test_utils.withdraw(account, withdraw_amount)
 
     # Verify position total value decreased by withdraw amount
     tv_after_withdraw = await test_utils.get_position_total_value(position_id)