remove TestPlus dep

coinbase · Apr 22, 2024 · 121b679 · 121b679
1 parent 6579faa
commit 121b679
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -43,12 +43,11 @@ RemoveOwnerAtIndexTest:test_revert_whenWrongOwnerAtIndex() (gas: 36728)
 RemoveOwnerAtIndexTest:test_reverts_ifIsLastOwner() (gas: 7647492)
 TestCanSkipChainIdValidation:test_approvedSelectorsReturnTrue() (gas: 17781)
 TestCanSkipChainIdValidation:test_otherSelectorsReturnFalse() (gas: 12579)
-TestExecuteWithoutChainIdValidation:testExecute() (gas: 424882)
+TestExecuteWithoutChainIdValidation:testExecute() (gas: 403873)
 TestExecuteWithoutChainIdValidation:testExecuteBatch() (gas: 728942)
 TestExecuteWithoutChainIdValidation:testExecuteBatch(uint256) (runs: 256, μ: 3608152, ~: 3468946)
-TestExecuteWithoutChainIdValidation:test__codesize() (gas: 49944)
 TestExecuteWithoutChainIdValidation:test__codesize() (gas: 50179)
-TestExecuteWithoutChainIdValidation:test_revertsWithReservedNonce() (gas: 82007)
+TestExecuteWithoutChainIdValidation:test_revertsWithReservedNonce() (gas: 81941)
 TestExecuteWithoutChainIdValidation:test_reverts_whenCallerNotEntryPoint() (gas: 11031)
 TestExecuteWithoutChainIdValidation:test_reverts_whenOneCallReverts() (gas: 467783)
 TestExecuteWithoutChainIdValidation:test_reverts_whenOneSelectorNotApproved() (gas: 179662)

diff --git a/test/CoinbaseSmartWallet/Execute.t.sol b/test/CoinbaseSmartWallet/Execute.t.sol
@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "solady/../test/utils/TestPlus.sol";
-
 import {MockTarget} from "../mocks/MockTarget.sol";
 import "./SmartWalletTestBase.sol";
 
-contract TestExecuteWithoutChainIdValidation is SmartWalletTestBase, TestPlus {
+contract TestExecuteWithoutChainIdValidation is SmartWalletTestBase {
     function setUp() public override {
         userOpCalldata = abi.encodeWithSelector(CoinbaseSmartWallet.execute.selector);
         super.setUp();
@@ -32,7 +30,7 @@ contract TestExecuteWithoutChainIdValidation is SmartWalletTestBase, TestPlus {
         assertEq(MockTarget(target).datahash(), keccak256(data));
         assertEq(target.balance, 123);
 
-        vm.prank(_randomNonZeroAddress());
+        vm.prank(makeAddr("random"));
         vm.expectRevert(MultiOwnable.Unauthorized.selector);
         account.execute(target, 123, abi.encodeWithSignature("setData(bytes)", data));