diff --git a/test/periphery/fork/merkle-campaign/MerkleLL.t.sol b/test/periphery/fork/merkle-campaign/MerkleLL.t.sol index 6c98158ad..4ea124560 100644 --- a/test/periphery/fork/merkle-campaign/MerkleLL.t.sol +++ b/test/periphery/fork/merkle-campaign/MerkleLL.t.sol @@ -36,7 +36,6 @@ abstract contract MerkleLL_Fork_Test is Fork_Test { uint256 aggregateAmount; uint128[] amounts; MerkleBase.ConstructorParams baseParams; - bool cancelable; uint128 clawbackAmount; address expectedLL; LockupLinear.StreamLL expectedStream; @@ -49,7 +48,6 @@ abstract contract MerkleLL_Fork_Test is Fork_Test { bytes32 merkleRoot; address[] recipients; uint256 recipientCount; - bool transferable; } // We need the leaves as a storage variable so that we can use OpenZeppelin's {Arrays.findUpperBound}. @@ -119,7 +117,7 @@ abstract contract MerkleLL_Fork_Test is Fork_Test { merkleLL: ISablierMerkleLL(vars.expectedLL), baseParams: vars.baseParams, lockupLinear: lockupLinear, - cancelable: vars.cancelable, + cancelable: defaults.CANCELABLE(), transferable: defaults.TRANSFERABLE(), streamDurations: defaults.durations(), aggregateAmount: vars.aggregateAmount, @@ -129,8 +127,8 @@ abstract contract MerkleLL_Fork_Test is Fork_Test { vars.merkleLL = merkleFactory.createMerkleLL({ baseParams: vars.baseParams, lockupLinear: lockupLinear, - cancelable: vars.cancelable, - transferable: vars.transferable, + cancelable: defaults.CANCELABLE(), + transferable: defaults.TRANSFERABLE(), streamDurations: defaults.durations(), aggregateAmount: vars.aggregateAmount, recipientCount: vars.recipientCount diff --git a/test/periphery/fork/merkle-campaign/MerkleLT.t.sol b/test/periphery/fork/merkle-campaign/MerkleLT.t.sol index 2c8e05a92..0283d5965 100644 --- a/test/periphery/fork/merkle-campaign/MerkleLT.t.sol +++ b/test/periphery/fork/merkle-campaign/MerkleLT.t.sol @@ -37,7 +37,6 @@ abstract contract MerkleLT_Fork_Test is Fork_Test { uint256 aggregateAmount; uint128[] amounts; MerkleBase.ConstructorParams baseParams; - bool cancelable; uint128 clawbackAmount; address expectedLT; LockupTranched.StreamLT expectedStream; @@ -50,7 +49,6 @@ abstract contract MerkleLT_Fork_Test is Fork_Test { bytes32 merkleRoot; address[] recipients; uint256 recipientCount; - bool transferable; } // We need the leaves as a storage variable so that we can use OpenZeppelin's {Arrays.findUpperBound}. @@ -120,8 +118,8 @@ abstract contract MerkleLT_Fork_Test is Fork_Test { merkleLT: ISablierMerkleLT(vars.expectedLT), baseParams: vars.baseParams, lockupTranched: lockupTranched, - cancelable: vars.cancelable, - transferable: vars.transferable, + cancelable: defaults.CANCELABLE(), + transferable: defaults.TRANSFERABLE(), tranchesWithPercentages: defaults.tranchesWithPercentages(), totalDuration: defaults.TOTAL_DURATION(), aggregateAmount: vars.aggregateAmount, @@ -131,8 +129,8 @@ abstract contract MerkleLT_Fork_Test is Fork_Test { vars.merkleLT = merkleFactory.createMerkleLT({ baseParams: vars.baseParams, lockupTranched: lockupTranched, - cancelable: vars.cancelable, - transferable: vars.transferable, + cancelable: defaults.CANCELABLE(), + transferable: defaults.TRANSFERABLE(), tranchesWithPercentages: defaults.tranchesWithPercentages(), aggregateAmount: vars.aggregateAmount, recipientCount: vars.recipientCount