From dc54209b735dd636f6ba9f055b67ba6929a4654c Mon Sep 17 00:00:00 2001 From: Ardian Date: Fri, 1 Dec 2023 13:20:49 +0100 Subject: [PATCH] chore: lint --- packages/packages.json | 10 +++++----- packages/valory/agents/trader/aea-config.yaml | 6 +++--- packages/valory/services/trader/service.yaml | 2 +- .../skills/decision_maker_abci/fsm_specification.yaml | 3 ++- packages/valory/skills/decision_maker_abci/rounds.py | 2 +- packages/valory/skills/decision_maker_abci/skill.yaml | 4 ++-- .../valory/skills/trader_abci/fsm_specification.yaml | 3 ++- packages/valory/skills/trader_abci/models.py | 1 - packages/valory/skills/trader_abci/skill.yaml | 8 ++++---- .../tx_settlement_multiplexer_abci/behaviours.py | 10 +++++++--- .../skills/tx_settlement_multiplexer_abci/skill.yaml | 4 ++-- 11 files changed, 29 insertions(+), 24 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index db23ba83d..9686824e9 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { "skill/valory/market_manager_abci/0.1.0": "bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i", - "skill/valory/decision_maker_abci/0.1.0": "bafybeigrtd3td5b5ibq4tz7vzokan72h62fppfs75il7epxkm7l4afi2f4", - "skill/valory/trader_abci/0.1.0": "bafybeie2mofvch2nvg6ywvqueckxhwauxzbplktgxzpw4cmzgw2axelrre", + "skill/valory/decision_maker_abci/0.1.0": "bafybeibexxfncbkadishdsqidrmblj5jjxj2aocmwfx2ut7l74b34kn524", + "skill/valory/trader_abci/0.1.0": "bafybeifnyymftb6ucebk4nbmp4iujuiogfred7vxikimi3r7fqoukthqoy", "contract/valory/market_maker/0.1.0": "bafybeid5jnetbsusgxkpqzwyiqlwut55xktfbeloipxcemcuu5oopmqtl4", - "agent/valory/trader/0.1.0": "bafybeieliixs2whsx4slzvyo5p7yyyaia43w2fqcm2yiktnylkne3s7wne", - "service/valory/trader/0.1.0": "bafybeibmhqz2rhc6tlqxnco2g7pcabzcniq3bfv7d5gf57hcdxz4r6bndq", + "agent/valory/trader/0.1.0": "bafybeif56wkjqzp4dfdgec3i5agdk4h2gilzctu4m6c2que5l4ncrzgohi", + "service/valory/trader/0.1.0": "bafybeibgd77ydohdnrwaoutj2bjqslle626z2m6vz3rhxsrruautry7qqy", "contract/valory/erc20/0.1.0": "bafybeiepg5ymxhtylgijs3mf3lezz6cwcsougbrv2gr4xcq3bp5wxusi64", - "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeiayt5mk22qmba74qhcszy6oaukewl2glscf4fsh6aai2klac6tege", + "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeietgjhq6qig5d5w6gcnzyluefxqeym3fvpjcmnnkzkucljcqz5tq4", "contract/valory/mech/0.1.0": "bafybeieo65rtidzgrx22la7z7azoqbisd35hnoqfw7l3xxctotvctjlkju", "contract/valory/realitio/0.1.0": "bafybeieoily22pasgkzzcyawhqyrsko7b52lghnvwuskhomavb7tlb6pxa", "contract/valory/realitio_proxy/0.1.0": "bafybeidx37xzjjmapwacedgzhum6grfzhp5vhouz4zu3pvpgdy5pgb2fr4", diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml index 888df67e1..e98b1cbca 100644 --- a/packages/valory/agents/trader/aea-config.yaml +++ b/packages/valory/agents/trader/aea-config.yaml @@ -43,10 +43,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeiencz2uytz6fqj5wg7mcunevxjh4xg5gd6pqcgkshgqywhcimweyi - valory/termination_abci:0.1.0:bafybeigainmpy37gb33ogbrpggjbkuasodhthh5oz4vbzjdfjozerpf224 - valory/transaction_settlement_abci:0.1.0:bafybeigk3debp6dswutqsuls2lqfvyj4ghe6kwjc2zfinnsvj6hujynxtq -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiayt5mk22qmba74qhcszy6oaukewl2glscf4fsh6aai2klac6tege +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeietgjhq6qig5d5w6gcnzyluefxqeym3fvpjcmnnkzkucljcqz5tq4 - valory/market_manager_abci:0.1.0:bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i -- valory/decision_maker_abci:0.1.0:bafybeigrtd3td5b5ibq4tz7vzokan72h62fppfs75il7epxkm7l4afi2f4 -- valory/trader_abci:0.1.0:bafybeie2mofvch2nvg6ywvqueckxhwauxzbplktgxzpw4cmzgw2axelrre +- valory/decision_maker_abci:0.1.0:bafybeibexxfncbkadishdsqidrmblj5jjxj2aocmwfx2ut7l74b34kn524 +- valory/trader_abci:0.1.0:bafybeifnyymftb6ucebk4nbmp4iujuiogfred7vxikimi3r7fqoukthqoy - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe default_ledger: ethereum required_ledgers: diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml index 52ecb6de2..d8e958708 100644 --- a/packages/valory/services/trader/service.yaml +++ b/packages/valory/services/trader/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq fingerprint_ignore_patterns: [] -agent: valory/trader:0.1.0:bafybeieliixs2whsx4slzvyo5p7yyyaia43w2fqcm2yiktnylkne3s7wne +agent: valory/trader:0.1.0:bafybeif56wkjqzp4dfdgec3i5agdk4h2gilzctu4m6c2que5l4ncrzgohi number_of_agents: 4 deployment: {} --- diff --git a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml index 497b91402..68dca3de7 100644 --- a/packages/valory/skills/decision_maker_abci/fsm_specification.yaml +++ b/packages/valory/skills/decision_maker_abci/fsm_specification.yaml @@ -8,6 +8,7 @@ alphabet_in: - NO_MAJORITY - NO_OP - NO_REDEEMING +- REDEEM_ROUND_TIMEOUT - ROUND_TIMEOUT - SLOTS_UNSUPPORTED_ERROR - TIE @@ -68,7 +69,7 @@ transition_func: (RedeemRound, NONE): ImpossibleRound (RedeemRound, NO_MAJORITY): RedeemRound (RedeemRound, NO_REDEEMING): FinishedWithoutRedeemingRound - (RedeemRound, ROUND_TIMEOUT): FinishedWithoutRedeemingRound + (RedeemRound, REDEEM_ROUND_TIMEOUT): FinishedWithoutRedeemingRound (SamplingRound, DONE): ToolSelectionRound (SamplingRound, NONE): FinishedWithoutDecisionRound (SamplingRound, NO_MAJORITY): SamplingRound diff --git a/packages/valory/skills/decision_maker_abci/rounds.py b/packages/valory/skills/decision_maker_abci/rounds.py index b745fa409..b5ef8bcad 100644 --- a/packages/valory/skills/decision_maker_abci/rounds.py +++ b/packages/valory/skills/decision_maker_abci/rounds.py @@ -110,7 +110,7 @@ class DecisionMakerAbciApp(AbciApp[Event]): - done: 8. - no redeeming: 10. - no majority: 6. - - round timeout: 10. + - redeem round timeout: 10. - none: 12. 7. HandleFailedTxRound - blacklist: 4. diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml index 5d011bba6..4d24e6622 100644 --- a/packages/valory/skills/decision_maker_abci/skill.yaml +++ b/packages/valory/skills/decision_maker_abci/skill.yaml @@ -23,13 +23,13 @@ fingerprint: behaviours/sampling.py: bafybeifzhm4sspdvt227ksl5hjn26offgqpwempgbcwbr6dq7gyi2a46sm behaviours/tool_selection.py: bafybeifpvrrbftlkjsoiysnasihzttousk6hxnukzrln6z2d33e3zexkje dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm - fsm_specification.yaml: bafybeiefakgrltqy5grptkymrdscli7ergicqkaxef42okv2l7krjqd6iq + fsm_specification.yaml: bafybeidqrxj3l3e555znk4wxx6spwaijz3bhc5yialhzbhd6ngk52w7jbq handlers.py: bafybeihj33szgrcxnpd73s4nvluyxwwsvhjum2cuq3ilhhe6vfola3k7vy models.py: bafybeif3ubulx7cr7bh7yvwhik2footnfi6ofvjoioym3w6eka3owi67pe payloads.py: bafybeigcic4vewdglakzpyqevhfwsolh4ywnbvxo5bgned7gl5uo3jif7m policy.py: bafybeidpmx4ek3qze63zpuwixyf6t7bdv62ewgkzt3ljrzadiwdw64cueq redeem_info.py: bafybeibddfxwp3577c3dl2utaowwltquu5fg6crezpumoebw563wxpbfrm - rounds.py: bafybeib3ylhqybc7dhmq2vbe6luka6uv4d23xmmrqcgva4wrzwpjn227om + rounds.py: bafybeidni2ejmrdhybtkmx7565553e362jtg56zxnczcx66bq5xkbjldtq states/__init__.py: bafybeid23llnyp6j257dluxmrnztugo5llsrog7kua53hllyktz4dqhqoy states/base.py: bafybeibhcc4pc3m6qelvdvxssnuglcwfaff55cr2kule74ekauyf3bahpq states/bet_placement.py: bafybeibalhxhp2c4oljmiwqi6ds3g36fgtabmf42mb5sgq6z22znrcbhda diff --git a/packages/valory/skills/trader_abci/fsm_specification.yaml b/packages/valory/skills/trader_abci/fsm_specification.yaml index 3c116c41f..889ab6efb 100644 --- a/packages/valory/skills/trader_abci/fsm_specification.yaml +++ b/packages/valory/skills/trader_abci/fsm_specification.yaml @@ -21,6 +21,7 @@ alphabet_in: - NO_OP - NO_REDEEMING - REDEEMING_DONE +- REDEEM_ROUND_TIMEOUT - REFILL_REQUIRED - RESET_AND_PAUSE_TIMEOUT - RESET_TIMEOUT @@ -138,7 +139,7 @@ transition_func: (RedeemRound, NONE): ImpossibleRound (RedeemRound, NO_MAJORITY): RedeemRound (RedeemRound, NO_REDEEMING): CallCheckpointRound - (RedeemRound, ROUND_TIMEOUT): CallCheckpointRound + (RedeemRound, REDEEM_ROUND_TIMEOUT): CallCheckpointRound (RegistrationRound, DONE): UpdateBetsRound (RegistrationRound, NO_MAJORITY): RegistrationRound (RegistrationStartupRound, DONE): UpdateBetsRound diff --git a/packages/valory/skills/trader_abci/models.py b/packages/valory/skills/trader_abci/models.py index b69b2113b..e4bbbbf2d 100644 --- a/packages/valory/skills/trader_abci/models.py +++ b/packages/valory/skills/trader_abci/models.py @@ -53,7 +53,6 @@ from packages.valory.skills.termination_abci.models import TerminationParams from packages.valory.skills.trader_abci.composition import TraderAbciApp from packages.valory.skills.transaction_settlement_abci.rounds import Event as TSEvent -from packages.valory.skills.decision_maker_abci.rounds import Event as DecisionMakerEvent from packages.valory.skills.tx_settlement_multiplexer_abci.models import ( TxSettlementMultiplexerParams, ) diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml index 8f85294f3..9770391dd 100644 --- a/packages/valory/skills/trader_abci/skill.yaml +++ b/packages/valory/skills/trader_abci/skill.yaml @@ -11,9 +11,9 @@ fingerprint: behaviours.py: bafybeieesrefrpo5c5upzztgm5fwfrmxeagilacuau5nacobhsfvgpbzby composition.py: bafybeiajga2m7pv7v4bxsjsnncavdns6gujg7qg7opfjyznlzip3gbd3nm dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm - fsm_specification.yaml: bafybeiecxat37q634mgmv3hwgevulr726k3cc6ild3kylititnf3w7gl5m + fsm_specification.yaml: bafybeib3ycl5bjo5uilyaly7uoovvc3b3gpjrkuvdos5ffsgmrs73j6bkm handlers.py: bafybeicamc6vmozij5dwvkxmbxjazsgf3sacojhstbjtq7vfggszxugvey - models.py: bafybeifyk4dmnpq2vblrj3ldoaicsamidww6am4zvbind6ijlpbdawcz4m + models.py: bafybeicn2hiu22rwbprphl7zftgxeeehsuj6nirydmyugwiqay6avvjbna fingerprint_ignore_patterns: [] connections: [] contracts: [] @@ -25,8 +25,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeigk3debp6dswutqsuls2lqfvyj4ghe6kwjc2zfinnsvj6hujynxtq - valory/termination_abci:0.1.0:bafybeigainmpy37gb33ogbrpggjbkuasodhthh5oz4vbzjdfjozerpf224 - valory/market_manager_abci:0.1.0:bafybeic7o4pclkhnugyn7js5g3asxuqhkxpvunlp3mpup7aovhg2fto22i -- valory/decision_maker_abci:0.1.0:bafybeigrtd3td5b5ibq4tz7vzokan72h62fppfs75il7epxkm7l4afi2f4 -- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeiayt5mk22qmba74qhcszy6oaukewl2glscf4fsh6aai2klac6tege +- valory/decision_maker_abci:0.1.0:bafybeibexxfncbkadishdsqidrmblj5jjxj2aocmwfx2ut7l74b34kn524 +- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeietgjhq6qig5d5w6gcnzyluefxqeym3fvpjcmnnkzkucljcqz5tq4 - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe behaviours: main: diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/behaviours.py b/packages/valory/skills/tx_settlement_multiplexer_abci/behaviours.py index 138e2c852..97f3d202c 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/behaviours.py +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/behaviours.py @@ -131,8 +131,10 @@ def synchronized_data(self) -> SynchronizedData: def _on_redeem_round_tx_settled(self) -> None: """Handle the redeem round.""" - self.context.logger.info("Redeeming transaction was settled. Resetting the redeeming progress.") - self.shared_state.redeeming_progress = RedeemingProgress() + self.context.logger.info( + "Redeeming transaction was settled. Resetting the redeeming progress." + ) + self.shared_state.redeeming_progress = RedeemingProgress() # type: ignore def _on_tx_settled(self) -> None: """Handle the tx settled event.""" @@ -140,7 +142,9 @@ def _on_tx_settled(self) -> None: handler_name = f"_on_{tx_submitter}_tx_settled" handler = getattr(self, handler_name, None) if handler is None: - self.context.logger.info(f"No post tx settlement handler exists for {tx_submitter} txs.") + self.context.logger.info( + f"No post tx settlement handler exists for {tx_submitter} txs." + ) return handler() diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml index 88459208f..5f0a37fa6 100644 --- a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml +++ b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiegcjg2wjrsqhrmvyulioch3d67rnbzkx5af3ztkaw7kxathjreda __init__.py: bafybeide6k22zk4f3hyzhpapaoddsnxpw5elqcfvrxxj4nfvpzctv6jqhu - behaviours.py: bafybeiakntvnx7wcdpoylswfb76r5odsamsj7bpiworqf3enzuubvqn6cm + behaviours.py: bafybeifboxplklx3eqaljkugio7y72thpb5jdboqcickefuklhverksw5y dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm fsm_specification.yaml: bafybeidwxjna36auqbtqlehx73kyb6o74suhzj5bothgtiapcj35b7gzve handlers.py: bafybeiafbqr7ojfcbwohvee7x4zzswad3ymfrrbjlfz7uuuttmn3qdfs6q @@ -21,7 +21,7 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru skills: - valory/abstract_round_abci:0.1.0:bafybeidau7loztcfy3mxvoqrv7otbpciemd2wf3lsxyjraq4dcvuvib25e -- valory/decision_maker_abci:0.1.0:bafybeigrtd3td5b5ibq4tz7vzokan72h62fppfs75il7epxkm7l4afi2f4 +- valory/decision_maker_abci:0.1.0:bafybeibexxfncbkadishdsqidrmblj5jjxj2aocmwfx2ut7l74b34kn524 - valory/staking_abci:0.1.0:bafybeia3acxumkjg566dvgagv3swz7htf5xpvwq6ovmecvp5j2zdxdoabe behaviours: main: