Skip to content

Commit 12c61f8

Browse files
kaze-cowkaze-cow
committed
clean up compiler warnings
1 parent b650190 commit 12c61f8

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎test/CowEvcCollateralSwapWrapper.t.sol‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {SignerECDSA} from "./helpers/SignerECDSA.sol";
1717
/// @notice Tests the full flow of swapping collateral between vaults
1818
contract CowEvcCollateralSwapWrapperTest is CowBaseTest {
1919
CowEvcCollateralSwapWrapper public collateralSwapWrapper;
20-
SignerECDSA internal signerECDSA;
20+
SignerECDSA internal ecdsa;
2121

2222
uint256 constant SUSDS_MARGIN = 2000e18;
2323

@@ -34,7 +34,7 @@ contract CowEvcCollateralSwapWrapperTest is CowBaseTest {
3434
allowList.addSolver(address(collateralSwapWrapper));
3535
vm.stopPrank();
3636

37-
signerECDSA = new SignerECDSA(evc);
37+
ecdsa = new SignerECDSA(evc);
3838

3939
// sUSDS is not currently a collateral for WETH borrow, fix it
4040
vm.startPrank(IEVault(EWETH).governorAdmin());
@@ -200,7 +200,7 @@ contract CowEvcCollateralSwapWrapperTest is CowBaseTest {
200200

201201
// Prepare CollateralSwapParams
202202
uint256 deadline = block.timestamp + 1 hours;
203-
signerECDSA.setPrivateKey(privateKey);
203+
ecdsa.setPrivateKey(privateKey);
204204

205205
CowEvcCollateralSwapWrapper.CollateralSwapParams memory params = CowEvcCollateralSwapWrapper.CollateralSwapParams({
206206
owner: user,
@@ -213,7 +213,7 @@ contract CowEvcCollateralSwapWrapperTest is CowBaseTest {
213213
});
214214

215215
// Sign permit for EVC operator
216-
bytes memory permitSignature = signerECDSA.signPermit(
216+
bytes memory permitSignature = ecdsa.signPermit(
217217
user,
218218
address(collateralSwapWrapper),
219219
uint256(uint160(address(collateralSwapWrapper))),
@@ -384,7 +384,7 @@ contract CowEvcCollateralSwapWrapperTest is CowBaseTest {
384384
}
385385

386386
/// @notice Test parseWrapperData function
387-
function test_CollateralSwapWrapper_ParseWrapperData() external {
387+
function test_CollateralSwapWrapper_ParseWrapperData() external view {
388388
CowEvcCollateralSwapWrapper.CollateralSwapParams memory params = CowEvcCollateralSwapWrapper.CollateralSwapParams({
389389
owner: user,
390390
account: address(uint160(user) ^ uint8(0x01)),

‎test/unit/CowEvcCollateralSwapWrapper.unit.t.sol‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
pragma solidity ^0.8;
33

4-
import "forge-std/Test.sol";
4+
import {Test} from "forge-std/Test.sol";
55
import {IEVC} from "evc/EthereumVaultConnector.sol";
66
import {CowEvcCollateralSwapWrapper} from "../../src/CowEvcCollateralSwapWrapper.sol";
77
import {EmptyWrapper} from "../EmptyWrapper.sol";
8-
import {CowSettlement, CowAuthentication} from "../../src/vendor/CowWrapper.sol";
8+
import {CowSettlement} from "../../src/vendor/CowWrapper.sol";
99
import {MockEVC} from "./mocks/MockEVC.sol";
1010
import {MockCowAuthentication, MockCowSettlement} from "./mocks/MockCowProtocol.sol";
1111
import {MockERC20, MockVault} from "./mocks/MockERC20AndVaults.sol";
@@ -15,7 +15,7 @@ import {MockERC20, MockVault} from "./mocks/MockERC20AndVaults.sol";
1515
contract CowEvcCollateralSwapWrapperUnitTest is Test {
1616
CowEvcCollateralSwapWrapper public wrapper;
1717
EmptyWrapper public emptyWrapper;
18-
MockEVC public mockEVC;
18+
MockEVC public mockEvc;
1919
MockCowSettlement public mockSettlement;
2020
MockCowAuthentication public mockAuth;
2121
MockERC20 public mockAsset;
@@ -45,12 +45,12 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
4545
function setUp() public {
4646
mockAuth = new MockCowAuthentication();
4747
mockSettlement = new MockCowSettlement(address(mockAuth));
48-
mockEVC = new MockEVC();
48+
mockEvc = new MockEVC();
4949
mockAsset = new MockERC20("Mock Asset", "MOCK");
5050
mockFromVault = new MockVault(address(mockAsset), "Mock From Vault", "mFROM");
5151
mockToVault = new MockVault(address(mockAsset), "Mock To Vault", "mTO");
5252

53-
wrapper = new CowEvcCollateralSwapWrapper(address(mockEVC), CowSettlement(address(mockSettlement)));
53+
wrapper = new CowEvcCollateralSwapWrapper(address(mockEvc), CowSettlement(address(mockSettlement)));
5454
emptyWrapper = new EmptyWrapper(CowSettlement(address(mockSettlement)));
5555

5656
// Set solver as authenticated
@@ -59,15 +59,15 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
5959
mockAuth.setSolver(address(emptyWrapper), true);
6060

6161
// Set the correct onBehalfOfAccount for evcInternalSwap calls
62-
mockEVC.setOnBehalfOf(address(wrapper));
62+
mockEvc.setOnBehalfOf(address(wrapper));
6363
}
6464

6565
/*//////////////////////////////////////////////////////////////
6666
CONSTRUCTOR TESTS
6767
//////////////////////////////////////////////////////////////*/
6868

6969
function test_Constructor_SetsImmutables() public view {
70-
assertEq(address(wrapper.EVC()), address(mockEVC), "EVC not set correctly");
70+
assertEq(address(wrapper.EVC()), address(mockEvc), "EVC not set correctly");
7171
assertEq(address(wrapper.SETTLEMENT()), address(mockSettlement), "SETTLEMENT not set correctly");
7272
assertEq(address(wrapper.AUTHENTICATOR()), address(mockAuth), "AUTHENTICATOR not set correctly");
7373
assertEq(wrapper.NONCE_NAMESPACE(), uint256(uint160(address(wrapper))), "NONCE_NAMESPACE incorrect");
@@ -264,7 +264,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
264264
IEVC.BatchItem[] memory items = _decodeSignedCalldata(signedCalldata);
265265

266266
assertEq(items.length, 1, "Should have 1 batch item");
267-
assertEq(items[0].targetContract, address(mockEVC), "Should target EVC");
267+
assertEq(items[0].targetContract, address(mockEvc), "Should target EVC");
268268
assertEq(
269269
items[0].data,
270270
abi.encodeCall(IEVC.enableCollateral, (params.account, params.toVault)),
@@ -329,7 +329,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
329329

330330
mockSettlement.setSuccessfulSettle(true);
331331

332-
vm.prank(address(mockEVC));
332+
vm.prank(address(mockEvc));
333333
wrapper.evcInternalSwap(settleData, wrapperData, "");
334334

335335
// If we get here, prices were found successfully
@@ -368,7 +368,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
368368
);
369369
bytes memory wrapperData = abi.encode(params, new bytes(0));
370370

371-
vm.prank(address(mockEVC));
371+
vm.prank(address(mockEvc));
372372
vm.expectRevert(
373373
abi.encodeWithSelector(
374374
CowEvcCollateralSwapWrapper.PricesNotFoundInSettlement.selector,
@@ -412,7 +412,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
412412
);
413413
bytes memory wrapperData = abi.encode(params, new bytes(0));
414414

415-
vm.prank(address(mockEVC));
415+
vm.prank(address(mockEvc));
416416
vm.expectRevert(
417417
abi.encodeWithSelector(
418418
CowEvcCollateralSwapWrapper.PricesNotFoundInSettlement.selector,
@@ -466,9 +466,9 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
466466
mockSettlement.setSuccessfulSettle(true);
467467

468468
// Set incorrect onBehalfOfAccount (not address(wrapper))
469-
mockEVC.setOnBehalfOf(address(0x9999));
469+
mockEvc.setOnBehalfOf(address(0x9999));
470470

471-
vm.prank(address(mockEVC));
471+
vm.prank(address(mockEvc));
472472
vm.expectRevert(abi.encodeWithSelector(CowEvcCollateralSwapWrapper.Unauthorized.selector, address(0x9999)));
473473
wrapper.evcInternalSwap(settleData, wrapperData, remainingWrapperData);
474474
}
@@ -502,7 +502,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
502502

503503
mockSettlement.setSuccessfulSettle(true);
504504

505-
vm.prank(address(mockEVC));
505+
vm.prank(address(mockEvc));
506506
wrapper.evcInternalSwap(settleData, wrapperData, remainingWrapperData);
507507
}
508508

@@ -544,7 +544,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
544544

545545
mockSettlement.setSuccessfulSettle(true);
546546

547-
vm.prank(address(mockEVC));
547+
vm.prank(address(mockEvc));
548548
wrapper.evcInternalSwap(settleData, wrapperData, remainingWrapperData);
549549

550550
// Verify transfer occurred from account to owner (exact swapAmount for SELL)
@@ -598,7 +598,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
598598

599599
mockSettlement.setSuccessfulSettle(true);
600600

601-
vm.prank(address(mockEVC));
601+
vm.prank(address(mockEvc));
602602
wrapper.evcInternalSwap(settleData, wrapperData, remainingWrapperData);
603603

604604
// For KIND_BUY: transferAmount = swapAmount * toVaultPrice / fromVaultPrice
@@ -647,7 +647,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
647647

648648
mockSettlement.setSuccessfulSettle(true);
649649

650-
vm.prank(address(mockEVC));
650+
vm.prank(address(mockEvc));
651651
vm.expectRevert(
652652
abi.encodeWithSelector(
653653
CowEvcCollateralSwapWrapper.SubaccountMustBeControlledByOwner.selector, invalidSubaccount, OWNER
@@ -687,7 +687,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
687687

688688
mockSettlement.setSuccessfulSettle(true);
689689

690-
vm.prank(address(mockEVC));
690+
vm.prank(address(mockEvc));
691691
wrapper.evcInternalSwap(settleData, wrapperData, "");
692692

693693
// No transfer should occur, so balance should remain unchanged
@@ -742,7 +742,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
742742
bytes memory wrapperData = abi.encode(params, signature);
743743
wrapperData = abi.encodePacked(uint16(wrapperData.length), wrapperData);
744744

745-
mockEVC.setSuccessfulBatch(true);
745+
mockEvc.setSuccessfulBatch(true);
746746

747747
vm.prank(SOLVER);
748748
wrapper.wrappedSettle(settleData, wrapperData);
@@ -770,7 +770,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
770770
vm.prank(OWNER);
771771
wrapper.setPreApprovedHash(hash, true);
772772

773-
mockEVC.setOperator(OWNER, address(wrapper), true);
773+
mockEvc.setOperator(OWNER, address(wrapper), true);
774774

775775
address[] memory tokens = new address[](0);
776776
uint256[] memory prices = new uint256[](0);
@@ -791,7 +791,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
791791
bytes memory wrapperData = abi.encode(params, new bytes(0));
792792
wrapperData = abi.encodePacked(uint16(wrapperData.length), wrapperData);
793793

794-
mockEVC.setSuccessfulBatch(true);
794+
mockEvc.setSuccessfulBatch(true);
795795

796796
vm.prank(SOLVER);
797797
wrapper.wrappedSettle(settleData, wrapperData);
@@ -815,7 +815,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
815815
vm.prank(OWNER);
816816
wrapper.setPreApprovedHash(hash, true);
817817

818-
mockEVC.setOperator(OWNER, address(wrapper), true);
818+
mockEvc.setOperator(OWNER, address(wrapper), true);
819819

820820
bytes memory settleData = abi.encodeCall(
821821
CowSettlement.settle,
@@ -922,7 +922,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
922922

923923
mockSettlement.setSuccessfulSettle(true);
924924

925-
vm.prank(address(mockEVC));
925+
vm.prank(address(mockEvc));
926926
wrapper.evcInternalSwap(settleData, wrapperData, "");
927927

928928
// For KIND_BUY: transferAmount = 500e18 * 3e18 / 1e18 = 1500e18
@@ -1004,7 +1004,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
10041004

10051005
mockSettlement.setSuccessfulSettle(true);
10061006

1007-
vm.prank(address(mockEVC));
1007+
vm.prank(address(mockEvc));
10081008
wrapper.evcInternalSwap(settleData, wrapperData, remainingWrapperData);
10091009

10101010
// Should handle remaining wrapper data gracefully
@@ -1038,7 +1038,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
10381038
bytes memory wrapperData = abi.encode(params, signature);
10391039
wrapperData = abi.encodePacked(uint16(wrapperData.length), wrapperData);
10401040

1041-
mockEVC.setSuccessfulBatch(true);
1041+
mockEvc.setSuccessfulBatch(true);
10421042

10431043
vm.prank(SOLVER);
10441044
wrapper.wrappedSettle(settleData, wrapperData);
@@ -1062,7 +1062,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
10621062
vm.prank(OWNER);
10631063
wrapper.setPreApprovedHash(hash, true);
10641064

1065-
mockEVC.setOperator(OWNER, address(wrapper), true);
1065+
mockEvc.setOperator(OWNER, address(wrapper), true);
10661066

10671067
bytes memory settleData = abi.encodeCall(
10681068
CowSettlement.settle,
@@ -1080,7 +1080,7 @@ contract CowEvcCollateralSwapWrapperUnitTest is Test {
10801080
bytes memory wrapperData = abi.encode(params, new bytes(0));
10811081
wrapperData = abi.encodePacked(uint16(wrapperData.length), wrapperData);
10821082

1083-
mockEVC.setSuccessfulBatch(true);
1083+
mockEvc.setSuccessfulBatch(true);
10841084

10851085
vm.prank(SOLVER);
10861086
wrapper.wrappedSettle(settleData, wrapperData);

0 commit comments

Comments
 (0)