From 92c2aa7ea8ad42afcb4b886a4c5c355b1a88db04 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Tue, 28 May 2024 17:34:59 +0100 Subject: [PATCH] fix: exclude world systems --- packages/world/mud.config.ts | 5 +++ .../src/codegen/interfaces/IBaseWorld.sol | 17 ---------- .../interfaces/IPayableFallbackSystem.sol | 11 ------ .../src/codegen/interfaces/ITestSystem.sol | 13 ------- .../codegen/interfaces/IUtilsTestSystem.sol | 13 ------- .../interfaces/IWorldBalanceTestSystem.sol | 13 ------- .../codegen/interfaces/IWorldTestSystem.sol | 34 ------------------- 7 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 packages/world/src/codegen/interfaces/IPayableFallbackSystem.sol delete mode 100644 packages/world/src/codegen/interfaces/ITestSystem.sol delete mode 100644 packages/world/src/codegen/interfaces/IUtilsTestSystem.sol delete mode 100644 packages/world/src/codegen/interfaces/IWorldBalanceTestSystem.sol delete mode 100644 packages/world/src/codegen/interfaces/IWorldTestSystem.sol diff --git a/packages/world/mud.config.ts b/packages/world/mud.config.ts index 6ce75e044f..5b52303374 100644 --- a/packages/world/mud.config.ts +++ b/packages/world/mud.config.ts @@ -116,5 +116,10 @@ export default defineWorld({ // TODO: add support for inheritance to worldgen // (see: https://github.com/latticexyz/mud/issues/631) "StoreRegistrationSystem", + "PayableFallbackSystem", + "TestSystem", + "UtilsTestSystem", + "WorldBalanceTestSystem", + "WorldTestSystem", ], }); diff --git a/packages/world/src/codegen/interfaces/IBaseWorld.sol b/packages/world/src/codegen/interfaces/IBaseWorld.sol index 6005785344..722aa5585f 100644 --- a/packages/world/src/codegen/interfaces/IBaseWorld.sol +++ b/packages/world/src/codegen/interfaces/IBaseWorld.sol @@ -8,15 +8,10 @@ import { IWorldKernel } from "../../IWorldKernel.sol"; import { IAccessManagementSystem } from "./IAccessManagementSystem.sol"; import { IBalanceTransferSystem } from "./IBalanceTransferSystem.sol"; -import { ITestSystem } from "./ITestSystem.sol"; import { IBatchCallSystem } from "./IBatchCallSystem.sol"; import { IModuleInstallationSystem } from "./IModuleInstallationSystem.sol"; import { IWorldRegistrationSystem } from "./IWorldRegistrationSystem.sol"; import { IRegistrationSystem } from "./IRegistrationSystem.sol"; -import { IUtilsTestSystem } from "./IUtilsTestSystem.sol"; -import { IPayableFallbackSystem } from "./IPayableFallbackSystem.sol"; -import { IWorldTestSystem } from "./IWorldTestSystem.sol"; -import { IWorldBalanceTestSystem } from "./IWorldBalanceTestSystem.sol"; /** * @title IBaseWorld @@ -30,7 +25,6 @@ interface IBaseWorld is IWorldKernel, IAccessManagementSystem, IBalanceTransferSystem, - ITestSystem, IBatchCallSystem, IAccessManagementSystem, IBalanceTransferSystem, @@ -40,16 +34,5 @@ interface IBaseWorld is IRegistrationSystem, IModuleInstallationSystem, IRegistrationSystem, - ITestSystem, - ITestSystem, - ITestSystem, - IUtilsTestSystem, - IPayableFallbackSystem, - IWorldTestSystem, - IWorldBalanceTestSystem, - IUtilsTestSystem, - IPayableFallbackSystem, - IWorldTestSystem, - IWorldBalanceTestSystem, IWorldRegistrationSystem {} diff --git a/packages/world/src/codegen/interfaces/IPayableFallbackSystem.sol b/packages/world/src/codegen/interfaces/IPayableFallbackSystem.sol deleted file mode 100644 index 8891e9ba33..0000000000 --- a/packages/world/src/codegen/interfaces/IPayableFallbackSystem.sol +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.24; - -/* Autogenerated file. Do not edit manually. */ - -/** - * @title IPayableFallbackSystem - * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz) - * @dev This interface is automatically generated from the corresponding system contract. Do not edit manually. - */ -interface IPayableFallbackSystem {} diff --git a/packages/world/src/codegen/interfaces/ITestSystem.sol b/packages/world/src/codegen/interfaces/ITestSystem.sol deleted file mode 100644 index 2894fd0f2d..0000000000 --- a/packages/world/src/codegen/interfaces/ITestSystem.sol +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.24; - -/* Autogenerated file. Do not edit manually. */ - -/** - * @title ITestSystem - * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz) - * @dev This interface is automatically generated from the corresponding system contract. Do not edit manually. - */ -interface ITestSystem { - function msgSender() external view returns (address); -} diff --git a/packages/world/src/codegen/interfaces/IUtilsTestSystem.sol b/packages/world/src/codegen/interfaces/IUtilsTestSystem.sol deleted file mode 100644 index 098a4389ed..0000000000 --- a/packages/world/src/codegen/interfaces/IUtilsTestSystem.sol +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.24; - -/* Autogenerated file. Do not edit manually. */ - -/** - * @title IUtilsTestSystem - * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz) - * @dev This interface is automatically generated from the corresponding system contract. Do not edit manually. - */ -interface IUtilsTestSystem { - function systemNamespace() external view returns (bytes16); -} diff --git a/packages/world/src/codegen/interfaces/IWorldBalanceTestSystem.sol b/packages/world/src/codegen/interfaces/IWorldBalanceTestSystem.sol deleted file mode 100644 index 06cf82e06b..0000000000 --- a/packages/world/src/codegen/interfaces/IWorldBalanceTestSystem.sol +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.24; - -/* Autogenerated file. Do not edit manually. */ - -/** - * @title IWorldBalanceTestSystem - * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz) - * @dev This interface is automatically generated from the corresponding system contract. Do not edit manually. - */ -interface IWorldBalanceTestSystem { - function echoValue() external payable returns (uint256); -} diff --git a/packages/world/src/codegen/interfaces/IWorldTestSystem.sol b/packages/world/src/codegen/interfaces/IWorldTestSystem.sol deleted file mode 100644 index 54d46a7477..0000000000 --- a/packages/world/src/codegen/interfaces/IWorldTestSystem.sol +++ /dev/null @@ -1,34 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.24; - -/* Autogenerated file. Do not edit manually. */ - -import { WorldTestSystemReturn } from "./../../../test/WorldTestSystemReturn.sol"; - -/** - * @title IWorldTestSystem - * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz) - * @dev This interface is automatically generated from the corresponding system contract. Do not edit manually. - */ -interface IWorldTestSystem { - error WorldTestSystemError(string err); - - function getStoreAddress() external view returns (address); - - function msgSender() external view returns (address); - - function echo(bytes32 input) external view returns (WorldTestSystemReturn memory); - - function err(string memory input) external pure; - - function delegateCallSubSystem( - address subSystem, - bytes memory funcSelectorAndCalldata - ) external returns (bytes memory); - - function writeData(bytes14 namespace, bytes16 name, bool data) external; - - function emitCallType() external; - - function receiveEther() external payable; -}