Skip to content

Commit 68aef17

Browse files
0xTimepunk0xTimepunk
authored
chore: fix coverage (#662)
1 parent 71dd291 commit 68aef17

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

‎src/router-plus/SuperformRouterPlus.sol

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ contract SuperformRouterPlus is ISuperformRouterPlus, BaseSuperformRouterPlus {
382382
if (i == length - 1) {
383383
valueToPass += msg.value % length;
384384
}
385-
_deposit4626(vaults_[i], args[i], length, valueToPass);
385+
_deposit4626(vaults_[i], args[i], valueToPass);
386386
}
387387
}
388388

@@ -632,16 +632,8 @@ contract SuperformRouterPlus is ISuperformRouterPlus, BaseSuperformRouterPlus {
632632
/// @notice deposits ERC4626 vault shares into superform
633633
/// @param vault_ The ERC4626 vault to redeem from
634634
/// @param args Rest of the arguments to deposit 4626
635-
/// @param arrayLength The length of the array of deposit4626 calls
636635
/// @param valueToPass The value to pass to the deposit function
637-
function _deposit4626(
638-
address vault_,
639-
Deposit4626Args calldata args,
640-
uint256 arrayLength,
641-
uint256 valueToPass
642-
)
643-
internal
644-
{
636+
function _deposit4626(address vault_, Deposit4626Args calldata args, uint256 valueToPass) internal {
645637
_transferERC20In(IERC20(vault_), args.receiverAddressSP, args.amount);
646638
IERC4626 vault = IERC4626(vault_);
647639
address assetAdr = vault.asset();

‎test/unit/crosschain-data/utils/PayloadHelper.multiVault.t.sol

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ contract PayloadHelperMultiTest is ProtocolActions {
161161
function _checkSrcPayload() internal {
162162
vm.selectFork(FORKS[CHAIN_0]);
163163

164-
address _PayloadHelper = contracts[CHAIN_0][bytes32(bytes("PayloadHelper"))];
164+
address _PayloadHelper = contracts[CHAIN_0][bytes32(bytes("PayloadHelperV1"))];
165165
IPayloadHelper helper = IPayloadHelper(_PayloadHelper);
166166

167167
(uint8 txType, uint8 callbackType, uint8 multi, address srcSender, address receiverAddress, uint64 srcChainId) =
@@ -207,8 +207,9 @@ contract PayloadHelperMultiTest is ProtocolActions {
207207

208208
function _checkDstPayloadInit(CheckDstPayloadInitArgs memory args) internal {
209209
vm.selectFork(FORKS[DST_CHAINS[0]]);
210-
IPayloadHelper.DecodedDstPayload memory v =
211-
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]).decodeCoreStateRegistryPayload(1);
210+
IPayloadHelper.DecodedDstPayload memory v = IPayloadHelper(
211+
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]
212+
).decodeCoreStateRegistryPayload(1);
212213
bytes[] memory extraDataGenerated = new bytes[](2);
213214
extraDataGenerated[0] = abi.encode("500000");
214215
extraDataGenerated[1] = abi.encode("0");
@@ -263,7 +264,7 @@ contract PayloadHelperMultiTest is ProtocolActions {
263264
CheckDstPayloadLiqDataInternalVars memory v;
264265

265266
(v.txData, v.tokens,, v.bridgeIds, v.liqDstChainIds, v.amounts, v.nativeAmounts) = IPayloadHelper(
266-
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]
267+
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]
267268
).decodeCoreStateRegistryPayloadLiqData(2);
268269

269270
assertEq(v.bridgeIds[0], 1);
@@ -283,7 +284,7 @@ contract PayloadHelperMultiTest is ProtocolActions {
283284
vm.selectFork(FORKS[CHAIN_0]);
284285

285286
IPayloadHelper.DecodedDstPayload memory v =
286-
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelper"))]).decodeCoreStateRegistryPayload(1);
287+
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelperV1"))]).decodeCoreStateRegistryPayload(1);
287288

288289
assertEq(v.txType, 0);
289290

‎test/unit/crosschain-data/utils/PayloadHelper.singleVault.t.sol

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ contract PayloadHelperSingleTest is ProtocolActions {
143143
vm.selectFork(FORKS[ETH]);
144144

145145
vm.expectRevert(Error.INVALID_PAYLOAD_ID.selector);
146-
IPayloadHelper(contracts[ETH][bytes32(bytes("PayloadHelper"))]).decodePayloadHistory(2);
146+
IPayloadHelper(contracts[ETH][bytes32(bytes("PayloadHelperV1"))]).decodePayloadHistory(2);
147147
}
148148

149149
function test_decodeCoreStateRegistryPayload_invalidPayload() public {
@@ -158,7 +158,7 @@ contract PayloadHelperSingleTest is ProtocolActions {
158158
);
159159

160160
vm.expectRevert(Error.INVALID_PAYLOAD.selector);
161-
PayloadHelper(getContract(ETH, "PayloadHelper")).decodeCoreStateRegistryPayload(1);
161+
PayloadHelper(getContract(ETH, "PayloadHelperV1")).decodeCoreStateRegistryPayload(1);
162162
}
163163

164164
function test_constructorZeroAddress() public {
@@ -170,7 +170,7 @@ contract PayloadHelperSingleTest is ProtocolActions {
170170
vm.selectFork(FORKS[CHAIN_0]);
171171

172172
(uint8 txType, uint8 callbackType, uint8 multi, address srcSender, address receiverAddress, uint64 srcChainId) =
173-
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelper"))]).decodePayloadHistory(1);
173+
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelperV1"))]).decodePayloadHistory(1);
174174

175175
/// @dev 0 for deposit
176176
assertEq(txType, 0);
@@ -192,11 +192,12 @@ contract PayloadHelperSingleTest is ProtocolActions {
192192
vm.selectFork(FORKS[DST_CHAINS[0]]);
193193

194194
vm.expectRevert(Error.INVALID_PAYLOAD_ID.selector);
195-
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]).decodeCoreStateRegistryPayload(3);
195+
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]).decodeCoreStateRegistryPayload(3);
196196

197-
IPayloadHelper.DecodedDstPayload memory v =
198-
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]).decodeCoreStateRegistryPayload(1);
199-
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]).getDstPayloadProof(1);
197+
IPayloadHelper.DecodedDstPayload memory v = IPayloadHelper(
198+
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]
199+
).decodeCoreStateRegistryPayload(1);
200+
IPayloadHelper(contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]).getDstPayloadProof(1);
200201

201202
bytes[] memory extraDataGenerated = new bytes[](2);
202203
extraDataGenerated[0] = abi.encode("500000");
@@ -233,7 +234,7 @@ contract PayloadHelperSingleTest is ProtocolActions {
233234
vm.selectFork(FORKS[CHAIN_0]);
234235

235236
IPayloadHelper.DecodedDstPayload memory v =
236-
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelper"))]).decodeCoreStateRegistryPayload(1);
237+
IPayloadHelper(contracts[CHAIN_0][bytes32(bytes("PayloadHelperV1"))]).decodeCoreStateRegistryPayload(1);
237238

238239
/// @dev 0 for deposit
239240
assertEq(v.txType, 0);
@@ -265,7 +266,7 @@ contract PayloadHelperSingleTest is ProtocolActions {
265266
CheckDstPayloadLiqDataInternalVars memory v;
266267

267268
(v.txDatas, v.tokens,, v.bridgeIds, v.liqDstChainIds, v.amounts, v.nativeAmounts) = IPayloadHelper(
268-
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelper"))]
269+
contracts[DST_CHAINS[0]][bytes32(bytes("PayloadHelperV1"))]
269270
).decodeCoreStateRegistryPayloadLiqData(2);
270271

271272
assertEq(v.bridgeIds[0], 1);

‎test/utils/BaseSetup.sol

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ import { IAuthorizeOperator } from "src/vendor/centrifuge/IERC7540.sol";
9191
import { IERC7540Vault as IERC7540 } from "src/vendor/centrifuge/IERC7540.sol";
9292
import { AsyncStateRegistry } from "src/crosschain-data/extensions/AsyncStateRegistry.sol";
9393
import { RequestConfig } from "src/interfaces/IAsyncStateRegistry.sol";
94-
94+
import { PayloadHelper as PayloadHelperV1 } from "src/crosschain-data/utils/PayloadHelper.sol";
9595
import { PayloadHelper } from "src/crosschain-data/utils/PayloadHelperV2.sol";
9696
import { PaymentHelper } from "src/payments/PaymentHelper.sol";
9797
import { IPaymentHelperV2 as IPaymentHelper } from "src/interfaces/IPaymentHelperV2.sol";
@@ -163,6 +163,7 @@ abstract contract BaseSetup is StdInvariant, Test {
163163
"SuperRegistry",
164164
"SuperRBAC",
165165
"PayloadHelper",
166+
"PayloadHelperV1",
166167
"PaymentHelper",
167168
"PayMaster",
168169
"LayerZeroHelper",
@@ -1114,11 +1115,14 @@ abstract contract BaseSetup is StdInvariant, Test {
11141115
vars.superRBACC.BROADCASTER_ROLE(), contracts[vars.chainId][bytes32(bytes("SuperPositions"))]
11151116
);
11161117

1117-
/// @dev 14- deploy Payload Helper
1118+
/// @dev 14- deploy Payload Helper V2 and v1
11181119
vars.PayloadHelper = address(new PayloadHelper{ salt: salt }(vars.superRegistry));
11191120
contracts[vars.chainId][bytes32(bytes("PayloadHelper"))] = vars.PayloadHelper;
11201121
vars.superRegistryC.setAddress(vars.superRegistryC.PAYLOAD_HELPER(), vars.PayloadHelper, vars.chainId);
11211122

1123+
contracts[vars.chainId][bytes32(bytes("PayloadHelperV1"))] =
1124+
address(new PayloadHelperV1{ salt: salt }(vars.superRegistry));
1125+
11221126
/// @dev 15 - Deploy PayMaster
11231127
vars.payMaster = address(new PayMaster{ salt: salt }(vars.superRegistry));
11241128
contracts[vars.chainId][bytes32(bytes32("PayMaster"))] = vars.payMaster;

0 commit comments

Comments
 (0)