From fde3385288d26d9cecc07f8109802cf92d820367 Mon Sep 17 00:00:00 2001 From: inphi Date: Tue, 28 Oct 2025 19:12:19 -0400 Subject: [PATCH 1/2] ctb: Fix OPCM std validator test setup for v2 DG --- .../test/L1/OPContractsManagerStandardValidator.t.sol | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol index a4ba64b52cee2..8fe579c2f0e8c 100644 --- a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol +++ b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol @@ -142,12 +142,10 @@ abstract contract OPContractsManagerStandardValidator_TestInit is CommonTest, Di abi.encodeCall(IProxyAdmin.getProxyImplementation, (address(l1OptimismMintableERC20Factory))), abi.encode(opcm.opcmStandardValidator().optimismMintableERC20FactoryImpl()) ); - vm.mockCall( - address(pdg), - abi.encodeCall(IPermissionedDisputeGame.challenger, ()), - abi.encode(opcm.opcmStandardValidator().challenger()) + DisputeGames.mockGameImplProposer( + disputeGameFactory, GameTypes.PERMISSIONED_CANNON, opcm.opcmStandardValidator().challenger() ); - vm.mockCall(address(pdg), abi.encodeCall(IPermissionedDisputeGame.proposer, ()), abi.encode(proposer)); + DisputeGames.mockGameImplProposer(disputeGameFactory, GameTypes.PERMISSIONED_CANNON, proposer); vm.mockCall( address(proxyAdmin), abi.encodeCall(IProxyAdmin.owner, ()), From a8676baf0eb982c5b70cd7097c7b548442601238 Mon Sep 17 00:00:00 2001 From: inphi Date: Wed, 29 Oct 2025 12:16:15 -0400 Subject: [PATCH 2/2] fix typo --- .../test/L1/OPContractsManagerStandardValidator.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol index 8fe579c2f0e8c..c7d2bb941c585 100644 --- a/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol +++ b/packages/contracts-bedrock/test/L1/OPContractsManagerStandardValidator.t.sol @@ -142,7 +142,7 @@ abstract contract OPContractsManagerStandardValidator_TestInit is CommonTest, Di abi.encodeCall(IProxyAdmin.getProxyImplementation, (address(l1OptimismMintableERC20Factory))), abi.encode(opcm.opcmStandardValidator().optimismMintableERC20FactoryImpl()) ); - DisputeGames.mockGameImplProposer( + DisputeGames.mockGameImplChallenger( disputeGameFactory, GameTypes.PERMISSIONED_CANNON, opcm.opcmStandardValidator().challenger() ); DisputeGames.mockGameImplProposer(disputeGameFactory, GameTypes.PERMISSIONED_CANNON, proposer);