fixconfig

orbs-network · Dec 8, 2024 · ea70e3c · ea70e3c
1 parent 6529f0d
commit ea70e3c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 34 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -12,32 +12,32 @@ AdminWithdrawTest:test_WETH() (gas: 71280)
 AdminWithdrawTest:test_empty() (gas: 21526)
 AdminWithdrawTest:test_execute() (gas: 876842)
 AdminWithdrawTest:test_tokens() (gas: 879919)
-LiquidityHubAccessTest:test_revert_execute_onlyAllowed() (gas: 15353)
-LiquidityHubAccessTest:test_revert_reactorCallback_onlyReactor() (gas: 10584)
+LiquidityHubAccessTest:test_revert_execute_onlyAllowed() (gas: 15345)
+LiquidityHubAccessTest:test_revert_reactorCallback_onlyReactor() (gas: 10576)
 LiquidityHubAccessTest:test_revert_validationCallback_onlySelf() (gas: 11914)
-LiquidityHubExecuteTest:test_decayOnNegativeSlippage() (gas: 352290)
-LiquidityHubExecuteTest:test_emitEvents() (gas: 365707)
-LiquidityHubExecuteTest:test_gas() (gas: 259248)
-LiquidityHubExecuteTest:test_gasToAdmin() (gas: 349255)
-LiquidityHubExecuteTest:test_inTokenSlippage() (gas: 387614)
-LiquidityHubExecuteTest:test_longLimit() (gas: 351793)
-LiquidityHubExecuteTest:test_nativeOutput() (gas: 302419)
-LiquidityHubExecuteTest:test_nativeOutputSwapperLimit() (gas: 302496)
-LiquidityHubExecuteTest:test_nativeSlippageToRef() (gas: 302090)
-LiquidityHubExecuteTest:test_optionalRef() (gas: 313211)
-LiquidityHubExecuteTest:test_optionalRefshare() (gas: 313427)
-LiquidityHubExecuteTest:test_revert_swapperLimit() (gas: 362492)
-LiquidityHubExecuteTest:test_slippageToRef() (gas: 351902)
-LiquidityHubExecuteTest:test_swapperLimit() (gas: 349784)
-LiquidityHubExecuteTest:test_swapperLimitRespectsSurplus() (gas: 354499)
+LiquidityHubExecuteTest:test_decayOnNegativeSlippage() (gas: 352300)
+LiquidityHubExecuteTest:test_emitEvents() (gas: 365709)
+LiquidityHubExecuteTest:test_gas() (gas: 259247)
+LiquidityHubExecuteTest:test_gasToAdmin() (gas: 349265)
+LiquidityHubExecuteTest:test_inTokenSlippage() (gas: 387624)
+LiquidityHubExecuteTest:test_longLimit() (gas: 351803)
+LiquidityHubExecuteTest:test_nativeOutput() (gas: 302429)
+LiquidityHubExecuteTest:test_nativeOutputSwapperLimit() (gas: 302506)
+LiquidityHubExecuteTest:test_nativeSlippageToRef() (gas: 302100)
+LiquidityHubExecuteTest:test_optionalRef() (gas: 313209)
+LiquidityHubExecuteTest:test_optionalRefshare() (gas: 313425)
+LiquidityHubExecuteTest:test_revert_swapperLimit() (gas: 362502)
+LiquidityHubExecuteTest:test_slippageToRef() (gas: 351912)
+LiquidityHubExecuteTest:test_swapperLimit() (gas: 349794)
+LiquidityHubExecuteTest:test_swapperLimitRespectsSurplus() (gas: 354509)
 LiquidityHubExecuteTest:test_usdtOutput() (gas: 277)
-PartialOrderE2ETest:test_e2e_exactMirrorMatch() (gas: 463138)
+PartialOrderE2ETest:test_e2e_exactMirrorMatch() (gas: 463135)
 PartialOrderE2ETest:test_e2e_multiplePartialInputs() (gas: 635296)
-PartialOrderE2ETest:test_e2e_partialInputMatch() (gas: 482994)
-PartialOrderReactorTest:test_execute_swapFullAmount() (gas: 199136)
-PartialOrderReactorTest:test_execute_swapPartial() (gas: 309746)
-PartialOrderReactorTest:test_execute_swapPartialOdd() (gas: 199126)
-PartialOrderReactorTest:test_revert_insufficentAlowanceAfterSpending() (gas: 243074)
+PartialOrderE2ETest:test_e2e_partialInputMatch() (gas: 482991)
+PartialOrderReactorTest:test_execute_swapFullAmount() (gas: 199131)
+PartialOrderReactorTest:test_execute_swapPartial() (gas: 309736)
+PartialOrderReactorTest:test_execute_swapPartialOdd() (gas: 199121)
+PartialOrderReactorTest:test_revert_insufficentAlowanceAfterSpending() (gas: 243068)
 PartialOrderReactorTest:test_revert_requestGTSigned() (gas: 102056)
 RePermitTest:test_cancel() (gas: 80161)
 RePermitTest:test_domainSeparator() (gas: 5613)

diff --git a/out/LiquidityHub.sol/LiquidityHub.json b/out/LiquidityHub.sol/LiquidityHub.json
diff --git a/script/base/BaseScript.sol b/script/base/BaseScript.sol
@@ -15,9 +15,6 @@ import {Permit2Lib} from "src/Permit2Lib.sol";
 struct Config {
     Admin admin;
     LiquidityHub executor;
-    LiquidityHub executorPCX;
-    Admin fee00;
-    Admin fee01;
     IReactor reactor;
     IReactor reactor2;
     PartialOrderReactor reactorPartial;
@@ -37,9 +34,6 @@ abstract contract BaseScript is Script {
         );
         vm.label(address(config.admin), "admin");
         vm.label(address(config.executor), "executor");
-        vm.label(address(config.executorPCX), "executorPCX");
-        vm.label(address(config.fee00), "fee00");
-        vm.label(address(config.fee01), "fee01");
         vm.label(address(config.reactor), "reactor");
         vm.label(address(config.reactor2), "reactor2");
         vm.label(address(config.reactorPartial), "reactorPartial");

diff --git a/test/base/BaseTest.sol b/test/base/BaseTest.sol
@@ -49,17 +49,13 @@ abstract contract BaseTest is BaseScript, PermitSignature, DeployTestInfra {
         IReactor reactor = new ExclusiveDutchOrderReactor(IPermit2(Consts.PERMIT2_ADDRESS), address(0));
         IReactor reactor2 = new ExclusiveDutchOrderReactor(IPermit2(Consts.PERMIT2_ADDRESS), address(0));
         LiquidityHub executor = new LiquidityHub(reactor, IAllowed(address(admin)));
-        LiquidityHub executorPCX = new LiquidityHub(IReactor(makeAddr("reactorPCX")), IAllowed(address(admin)));
 
         RePermit repermit = new RePermit();
         PartialOrderReactor reactorPartial = new PartialOrderReactor(repermit);
 
         config = Config({
             admin: admin,
             executor: executor,
-            executorPCX: executorPCX,
-            fee00: admin,
-            fee01: admin,
             reactor: reactor,
             reactor2: reactor2,
             reactorPartial: reactorPartial,