chore: align repo with changes to minting flow

vegaprotocol · May 16, 2024 · 40ecff7 · 40ecff7
1 parent 0749a44
commit 40ecff7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/vega_sim/environment/environment.py b/vega_sim/environment/environment.py
@@ -40,8 +40,6 @@
 from vega_sim.null_service import VegaServiceNull
 from vega_sim.service import VegaService
 
-from vega_sim.service import VegaFaucetError
-
 logger = logging.getLogger(__name__)
 
 MarketState = namedtuple(
@@ -304,16 +302,8 @@ def step(self, vega: VegaService) -> None:
             if self.random_agent_ordering
             else self.agents
         ):
-            # TODO: Remove this once fauceting error has been investigated
-            try:
-                agent.step(vega)
-            except VegaFaucetError:
-                logger.exception(
-                    f"Agent {agent.name()} failed to step. Funds from faucet never"
-                    " received."
-                )
-                # Mint forwards blocks, wait for catchup
-                vega.wait_for_total_catchup()
+            agent.step(vega)
+            vega.wait_for_total_catchup()
 
 
 class MarketEnvironmentWithState(MarketEnvironment):
@@ -431,16 +421,7 @@ def step(self, vega: VegaService) -> None:
             if self.random_agent_ordering
             else self.agents
         ):
-            # TODO: Remove this once fauceting error has been investigated
-            try:
-                agent.step(state)
-            except VegaFaucetError:
-                logger.exception(
-                    f"Agent {agent.name()} failed to step. Funds from faucet never"
-                    " received."
-                )
-                # Mint forwards blocks, wait for catchup
-                vega.wait_for_total_catchup()
+            agent.step(state)
 
 
 class NetworkEnvironment(MarketEnvironmentWithState):

diff --git a/vega_sim/scenario/common/agents.py b/vega_sim/scenario/common/agents.py
@@ -1310,7 +1310,6 @@ def step(self, vega_state: VegaState):
                         asset=self.asset_id,
                         amount=self.initial_asset_mint,
                         key_name=self.key_name,
-                        raise_error=False,
                     )
                     self.vega.wait_for_total_catchup()
 
@@ -3271,7 +3270,6 @@ def step(self, vega_state: VegaState):
                         asset=self.asset_id,
                         amount=self.initial_asset_mint,
                         key_name=self.key_name,
-                        raise_error=False,
                     )
 
             # Ensure volume maximising range is at least 100bps wide to

diff --git a/vega_sim/scenario/fuzzed_markets/agents.py b/vega_sim/scenario/fuzzed_markets/agents.py
@@ -298,7 +298,6 @@ def check_balance(self, asset_id: str, amount: float):
             wallet_name=self.wallet_name,
             asset=asset_id,
             amount=amount,
-            raise_error=False,
         )
 
 
@@ -364,7 +363,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             self.close_outs += 1
             self.commitment_amount = 0
@@ -466,7 +464,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             self.close_outs += 1
             self.commitment_amount = 0
@@ -639,7 +636,6 @@ def step(self, vega_state):
                 wallet_name=self.wallet_name,
                 amount=self.initial_asset_mint,
                 asset=self.asset_id,
-                raise_error=False,
             )
             return