Skip to content

opcm: Switch cannon kona tests to depend on dev features being set through env vars #17746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Inphi merged 1 commit into from
Oct 7, 2025
Merged

opcm: Switch cannon kona tests to depend on dev features being set through env vars #17746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 9 additions & 27 deletions packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,18 +719,10 @@ contract OPContractsManager_AddGameType_Test is OPContractsManager_TestInit {
chainDeployOutput1.disputeGameFactoryProxy.initBonds(agi.disputeGameType), agi.initialBond, "bond mismatch"
);
}
}

/// @title OPContractsManager_AddGameTypeCannonKonaEnabled_Test
/// @notice Tests the `addGameType` function of the `OPContractsManager` contract with CANNON_KONA enabled.
contract OPContractsManager_AddGameType_CannonKonaEnabled_Test is OPContractsManager_AddGameType_Test {
function setUp() public override {
setDevFeatureEnabled(DevFeatures.CANNON_KONA);
super.setUp();
}

/// @notice Tests that addGameType will revert if the game type is cannon-kona and the dev feature is not enabled
function test_addGameType_cannonKonaGameType_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
// Create the input for the cannon-kona game type.
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.CANNON_KONA);

Expand All @@ -751,6 +743,7 @@ contract OPContractsManager_AddGameType_CannonKonaEnabled_Test is OPContractsMan

/// @notice Tests that addGameType will revert if the game type is cannon-kona and the dev feature is not enabled
function test_addGameType_superCannonKonaGameType_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
// Create the input for the cannon-kona game type.
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.SUPER_CANNON_KONA);

Expand Down Expand Up @@ -1035,18 +1028,10 @@ contract OPContractsManager_UpdatePrestate_Test is OPContractsManager_TestInit {
abi.encodeWithSelector(IOPContractsManager.PrestateRequired.selector)
);
}
}

/// @title OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test
/// @notice Tests the `updatePrestate` function of the `OPContractsManager` contract with CANNON_KONA enabled.
contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContractsManager_UpdatePrestate_Test {
function setUp() public override {
setDevFeatureEnabled(DevFeatures.CANNON_KONA);
super.setUp();
}

/// @notice Tests that we can update the prestate for both CANNON and CANNON_KONA game types.
function test_updatePrestate_bothGamesAndCannonKonaWithValidInput_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
// Add a FaultDisputeGame implementation via addGameType.
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.CANNON);
addGameType(input);
Expand All @@ -1065,6 +1050,7 @@ contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContracts
}

function test_updatePrestate_cannonKonaWithSuperGame_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
// Mock out the existence of a previous SuperPermissionedDisputeGame so we can add a real
// SuperPermissionedDisputeGame implementation.
vm.mockCall(
Expand Down Expand Up @@ -1152,6 +1138,7 @@ contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContracts
/// @notice Tests that we can update the prestate when both the PermissionedDisputeGame and
/// FaultDisputeGame exist, and the FaultDisputeGame is of type CANNON_KONA.
function test_updatePrestate_pdgAndCannonKonaOnly_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.CANNON_KONA);
addGameType(input);

Expand All @@ -1167,6 +1154,7 @@ contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContracts
/// @notice Tests that the updatePrestate function will revert if the provided prestate is for
/// mixed game types (i.e. CANNON and SUPER_CANNON_KONA).
function test_updatePrestate_cannonKonaMixedGameTypes_reverts() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
// Add a SuperFaultDisputeGame implementation via addGameType.
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.SUPER_CANNON_KONA);
addGameType(input);
Expand All @@ -1189,6 +1177,7 @@ contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContracts
function test_updatePrestate_presetCannonKonaWhenOnlyCannonPrestateIsZeroAndCannonGameTypeDisabled_reverts()
public
{
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.CANNON_KONA);
addGameType(input);

Expand All @@ -1206,6 +1195,7 @@ contract OPContractsManager_UpdatePrestate_CannonKonaEnabled_Test is OPContracts
/// @notice Tests that the updatePrestate function will revert if the provided prestate is the
/// zero hash.
function test_updatePrestate_whenCannonKonaPrestateIsZero_reverts() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
IOPContractsManager.AddGameInput memory input = newGameInputFactory(GameTypes.CANNON_KONA);
addGameType(input);

Expand Down Expand Up @@ -1834,17 +1824,9 @@ contract OPContractsManager_Migrate_Test is OPContractsManager_TestInit {
input, OPContractsManagerInteropMigrator.OPContractsManagerInteropMigrator_SuperchainConfigMismatch.selector
);
}
}

/// @title OPContractsManager_Migrate_CannonKonaEnabled_Test
/// @notice Tests the `migrate` function of the `OPContractsManager` contract.
contract OPContractsManager_Migrate_CannonKonaEnabled_Test is OPContractsManager_Migrate_Test {
function setUp() public override {
setDevFeatureEnabled(DevFeatures.CANNON_KONA);
super.setUp();
}

function test_migrate_zerosOutCannonKonaGameTypes_succeeds() public {
skipIfDevFeatureDisabled(DevFeatures.CANNON_KONA);
IOPContractsManagerInteropMigrator.MigrateInput memory input = _getDefaultInput();

// Grab the existing DisputeGameFactory for each chain.
Expand Down