Skip to content

refactor: fold remaining extension-flow wrappers through _exec_logged #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hunnyboy1217 wants to merge 1 commit into
base: test
Choose a base branch
from
+32 −37
Open

refactor: fold remaining extension-flow wrappers through _exec_logged #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 32 additions & 37 deletions allways/contract_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,16 @@ def _exec_logged(
log_msg: str,
args: Optional[dict] = None,
value: int = 0,
wait_for_inclusion: bool = True,
) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(method, args=args, keypair=wallet.hotkey, value=value)
tx_hash = self.exec_contract_raw(
method,
args=args,
keypair=wallet.hotkey,
value=value,
wait_for_inclusion=wait_for_inclusion,
)
bt.logging.info(f'{log_msg}: {tx_hash}')
return tx_hash

Expand Down Expand Up @@ -1064,73 +1071,61 @@ def propose_extend_reservation(
from_tx_hash: bytes,
target_block: int,
) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'propose_extend_reservation',
args={'miner': miner_hotkey, 'from_tx_hash': from_tx_hash, 'target_block': target_block},
keypair=wallet.hotkey,
wallet,
f'Propose extend reservation miner={miner_hotkey} target={target_block}',
{'miner': miner_hotkey, 'from_tx_hash': from_tx_hash, 'target_block': target_block},
wait_for_inclusion=False,
)
bt.logging.info(f'Propose extend reservation miner={miner_hotkey} target={target_block}: {tx_hash}')
return tx_hash

def challenge_extend_reservation(self, wallet: bt.Wallet, miner_hotkey: str) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'challenge_extend_reservation',
args={'miner': miner_hotkey},
keypair=wallet.hotkey,
wallet,
f'Challenge extend reservation miner={miner_hotkey}',
{'miner': miner_hotkey},
wait_for_inclusion=False,
)
bt.logging.info(f'Challenge extend reservation miner={miner_hotkey}: {tx_hash}')
return tx_hash

def finalize_extend_reservation(self, wallet: bt.Wallet, miner_hotkey: str) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'finalize_extend_reservation',
args={'miner': miner_hotkey},
keypair=wallet.hotkey,
wallet,
f'Finalize extend reservation miner={miner_hotkey}',
{'miner': miner_hotkey},
)
bt.logging.info(f'Finalize extend reservation miner={miner_hotkey}: {tx_hash}')
return tx_hash

def propose_extend_timeout(
self,
wallet: bt.Wallet,
swap_id: int,
target_block: int,
) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'propose_extend_timeout',
args={'swap_id': swap_id, 'target_block': target_block},
keypair=wallet.hotkey,
wallet,
f'Propose extend timeout swap={swap_id} target={target_block}',
{'swap_id': swap_id, 'target_block': target_block},
wait_for_inclusion=False,
)
bt.logging.info(f'Propose extend timeout swap={swap_id} target={target_block}: {tx_hash}')
return tx_hash

def challenge_extend_timeout(self, wallet: bt.Wallet, swap_id: int) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'challenge_extend_timeout',
args={'swap_id': swap_id},
keypair=wallet.hotkey,
wallet,
f'Challenge extend timeout swap={swap_id}',
{'swap_id': swap_id},
wait_for_inclusion=False,
)
bt.logging.info(f'Challenge extend timeout swap={swap_id}: {tx_hash}')
return tx_hash

def finalize_extend_timeout(self, wallet: bt.Wallet, swap_id: int) -> str:
self.ensure_initialized()
tx_hash = self.exec_contract_raw(
return self._exec_logged(
'finalize_extend_timeout',
args={'swap_id': swap_id},
keypair=wallet.hotkey,
wallet,
f'Finalize extend timeout swap={swap_id}',
{'swap_id': swap_id},
)
bt.logging.info(f'Finalize extend timeout swap={swap_id}: {tx_hash}')
return tx_hash

def _decode_pending_extension(self, data: bytes) -> Optional[PendingExtension]:
"""Decode an Option<PendingExtension> SCALE payload."""
Expand Down