Skip to content

Commit c6bb7a3

Browse files
committed
change to direct deploy
1 parent 2632ac6 commit c6bb7a3

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

src/PayGateway.sol

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
pragma solidity ^0.8.22;
33

44
import { ModularCore } from "lib/modular-contracts/src/ModularCore.sol";
5-
import { Initializable } from "lib/solady/src/utils/Initializable.sol";
65

7-
contract PayGateway is ModularCore, Initializable {
8-
constructor() {
9-
_disableInitializers();
10-
}
11-
12-
function initialize(address _owner, address[] memory _modules, bytes[] memory _moduleInstallData) external payable {
6+
contract PayGateway is ModularCore {
7+
constructor(address _owner, address[] memory _modules, bytes[] memory _moduleInstallData) {
138
_initializeOwner(_owner);
149

1510
// Install and initialize modules

test/PayGateway.t.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,14 @@ contract PayGatewayTest is Test {
7979
clientFeeAmount = 10;
8080

8181
// deploy and install module
82-
address impl = address(new PayGateway());
8382
address module = address(new PayGatewayModule());
8483

8584
address[] memory modules = new address[](1);
8685
bytes[] memory moduleData = new bytes[](1);
8786
modules[0] = address(module);
8887
moduleData[0] = "";
8988

90-
gateway = PayGatewayModule(LibClone.clone(impl));
91-
PayGateway(payable(address(gateway))).initialize(operator, modules, moduleData);
89+
gateway = PayGatewayModule(address(new PayGateway(operator, modules, moduleData)));
9290

9391
mockERC20 = new MockERC20("Token", "TKN");
9492
mockTarget = new MockTarget();

test/benchmarks/BenchmarkPayGateway.t.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,14 @@ contract BenchmarkPayGatewayTest is Test {
4949
clientFeeAmount = 10;
5050

5151
// deploy and install module
52-
address impl = address(new PayGateway());
5352
address module = address(new PayGatewayModule());
5453

5554
address[] memory modules = new address[](1);
5655
bytes[] memory moduleData = new bytes[](1);
5756
modules[0] = address(module);
5857
moduleData[0] = "";
5958

60-
gateway = PayGatewayModule(LibClone.clone(impl));
61-
PayGateway(payable(address(gateway))).initialize(operator, modules, moduleData);
59+
gateway = PayGatewayModule(address(new PayGateway(operator, modules, moduleData)));
6260

6361
mockERC20 = new MockERC20("Token", "TKN");
6462
mockTarget = new MockTarget();

0 commit comments

Comments
 (0)