Merge master to develop (#679)

mangrovedao · Dec 11, 2023 · 2c17eb6 · 2c17eb6
2 parents b4019ef + 138a677
commit 2c17eb6
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 45 deletions.
diff --git a/script/core/deployers/MangroveDeployer.s.sol b/script/core/deployers/MangroveDeployer.s.sol
@@ -35,7 +35,7 @@ contract MangroveDeployer is Deployer {
     broadcast();
     if (forMultisig) {
       mgv = IMangrove(
-        payable(address(new Mangrove{salt:salt}({governance: broadcaster(), gasprice: gasprice, gasmax: gasmax})))
+        payable(address(new Mangrove{salt: salt}({governance: broadcaster(), gasprice: gasprice, gasmax: gasmax})))
       );
     } else {
       mgv = IMangrove(payable(address(new Mangrove({governance: broadcaster(), gasprice: gasprice, gasmax: gasmax}))));

diff --git a/script/periphery/deployers/MgvReaderDeployer.s.sol b/script/periphery/deployers/MgvReaderDeployer.s.sol
@@ -21,7 +21,7 @@ contract MgvReaderDeployer is Deployer {
     MgvReader reader;
     broadcast();
     if (forMultisig) {
-      reader = new MgvReader{salt:salt}({mgv: address(mgv)});
+      reader = new MgvReader{salt: salt}({mgv: address(mgv)});
     } else {
       reader = new MgvReader({mgv: address(mgv)});
     }

diff --git a/script/toy/deployers/ERC20Deployer.sol b/script/toy/deployers/ERC20Deployer.sol
@@ -20,12 +20,8 @@ contract ERC20Deployer is Deployer {
     uint dec = vm.envUint("DECIMALS");
     require(uint8(dec) == dec, "Decimals overflow");
     broadcast();
-    TestToken token = new TestToken({
-      admin: broadcaster(),
-      name: vm.envString("NAME"),
-      symbol: symbol,
-      _decimals: uint8(dec)
-    });
+    TestToken token =
+      new TestToken({admin: broadcaster(), name: vm.envString("NAME"), symbol: symbol, _decimals: uint8(dec)});
     fork.set(symbol, address(token));
     broadcast();
     token.setMintLimit(vm.envUint("MINT_LIMIT"));

diff --git a/test/core/Gatekeeping.t.sol b/test/core/Gatekeeping.t.sol
@@ -924,13 +924,13 @@ contract GatekeepingTest is MangroveTest {
   }
 
   function test_admin_can_withdrawERC20(uint amount) public {
-    TestToken token = new TestToken(address(this),"Withdrawable","WDBL",18);
+    TestToken token = new TestToken(address(this), "Withdrawable", "WDBL", 18);
     deal(address(token), address(mgv), amount);
     mgv.withdrawERC20(address(token), amount);
   }
 
   function test_withdraw_failure_message(uint amount) public {
-    TestToken token = new TestToken(address(this),"Withdrawable","WDBL",18);
+    TestToken token = new TestToken(address(this), "Withdrawable", "WDBL", 18);
     vm.assume(amount > 0);
     deal(address(token), address(mgv), amount - 1);
     vm.expectRevert("mgv/withdrawERC20Fail");

diff --git a/test/core/TakerOperations.t.sol b/test/core/TakerOperations.t.sol
@@ -759,7 +759,7 @@ contract TakerOperationsTest is MangroveTest {
   // - Mangrove still has enough gas to revert
   // Here we test the OOG case with a special token "OutOfGasToken"
   function test_unsafe_gas_left_fails_to_pay_taker() public {
-    OutOfGasToken oogtt = new OutOfGasToken(address(this),"OutOfGasToken","OOGTT",18);
+    OutOfGasToken oogtt = new OutOfGasToken(address(this), "OutOfGasToken", "OOGTT", 18);
     oogtt.setTaker(address(this));
     deal($(oogtt), address(mkr), 100 ether);
     mkr.approveMgv(oogtt, type(uint).max);
@@ -823,19 +823,11 @@ contract TakerOperationsTest is MangroveTest {
    * reaching the `revert("mgv/swapError")` statement. To trigger that error, I
    * make a BadMangrove contract with a misbehaving `flashloan` function. */
   function test_unreachable_swapError() public {
-    IMangrove badMgv = IMangrove(
-      payable(
-        new BadMangrove({
-        governance: $(this),
-        gasprice: 40,
-        gasmax: 2_000_000
-        })
-      )
-    );
+    IMangrove badMgv = IMangrove(payable(new BadMangrove({governance: $(this), gasprice: 40, gasmax: 2_000_000})));
     vm.label($(badMgv), "Bad Mangrove");
     badMgv.activate(olKey, 0, 0, 0);
 
-    TestMaker mkr2 = new TestMaker(IMangrove($(badMgv)),olKey);
+    TestMaker mkr2 = new TestMaker(IMangrove($(badMgv)), olKey);
     badMgv.fund{value: 10 ether}($(mkr2));
     mkr2.newOfferByVolume(1 ether, 1 ether, 1, 0);
     vm.expectRevert("mgv/swapError");

diff --git a/test/lib/MangroveTest.sol b/test/lib/MangroveTest.sol
@@ -190,25 +190,11 @@ contract MangroveTest is Test2, HasMgvEvents {
   function setupMangrove() public returns (IMangrove _mgv) {
     if (options.measureGasusedMangrove) {
       _mgv = IMangrove(
-        $(
-          new MangroveMeasureGasused({
-          governance: $(this),
-          gasprice: options.gasprice,
-          gasmax: options.gasmax
-          })
-        )
+        $(new MangroveMeasureGasused({governance: $(this), gasprice: options.gasprice, gasmax: options.gasmax}))
       );
     } else {
       _mgv = IMangrove(
-        payable(
-          address(
-            new Mangrove({
-            governance: $(this),
-            gasprice: options.gasprice,
-            gasmax: options.gasmax
-            })
-          )
-        )
+        payable(address(new Mangrove({governance: $(this), gasprice: options.gasprice, gasmax: options.gasmax})))
       );
     }
     vm.label($(_mgv), "Mangrove");

diff --git a/test/lib/gas/OfferPosthookFailGasDelta.t.sol b/test/lib/gas/OfferPosthookFailGasDelta.t.sol
@@ -62,9 +62,9 @@ contract OfferPosthookFailGasDeltaTest is MangroveTest, IMaker {
       payable(
         address(
           new BeforePosthookGasMeasuringMangrove({
-          governance: $(this),
-          gasprice: options.gasprice,
-          gasmax: options.gasmax
+            governance: $(this),
+            gasprice: options.gasprice,
+            gasmax: options.gasmax
           })
         )
       )

diff --git a/test/periphery/MgvOracle.t.sol b/test/periphery/MgvOracle.t.sol
@@ -48,13 +48,13 @@ contract MgvOracleTest is Test2 {
   event SetDensity96X32(uint density96X32);
 
   function test_authOnly() public {
-    MgvOracleForInternal mgvOracle = new MgvOracleForInternal( address(0), address(0), 0);
+    MgvOracleForInternal mgvOracle = new MgvOracleForInternal(address(0), address(0), 0);
 
     //does not revert
     mgvOracle._authOnly();
 
     address governance = freshAddress("governance");
-    mgvOracle = new MgvOracleForInternal( governance, address(0), 0);
+    mgvOracle = new MgvOracleForInternal(governance, address(0), 0);
 
     vm.expectRevert("MgvOracle/unauthorized");
     mgvOracle._authOnly();
@@ -67,7 +67,7 @@ contract MgvOracleTest is Test2 {
   }
 
   function test_setGovernance() public {
-    MgvOracleForInternal mgvOracle = new MgvOracleForInternal( address(0), address(0), 0);
+    MgvOracleForInternal mgvOracle = new MgvOracleForInternal(address(0), address(0), 0);
 
     assertEq(mgvOracle.getGovernance(), address(0), "governance should not be set yet");
 
@@ -78,7 +78,7 @@ contract MgvOracleTest is Test2 {
   }
 
   function test_setMutator() public {
-    MgvOracleForInternal mgvOracle = new MgvOracleForInternal( address(0), address(0), 0);
+    MgvOracleForInternal mgvOracle = new MgvOracleForInternal(address(0), address(0), 0);
 
     assertEq(mgvOracle.getMutator(), address(0), "mutator should not be set yet");
 

diff --git a/test/script/periphery/CopyOpenSemibooks.t.sol b/test/script/periphery/CopyOpenSemibooks.t.sol
@@ -27,7 +27,7 @@ contract CopyOpenSemibooksTest is MangroveTest {
     mgv.setGovernance(chief);
 
     chief2 = freshAddress("chief2");
-    mgv2 = IMangrove(payable(new Mangrove(chief2,mgv.global().gasprice(),mgv.global().gasmax())));
+    mgv2 = IMangrove(payable(new Mangrove(chief2, mgv.global().gasprice(), mgv.global().gasmax())));
     reader2 = new MgvReader(address(mgv2));
 
     copier = new CopyOpenSemibooks();