diff --git a/.changeset/beige-badgers-smile.md b/.changeset/beige-badgers-smile.md new file mode 100644 index 0000000000..28964dafaf --- /dev/null +++ b/.changeset/beige-badgers-smile.md @@ -0,0 +1,17 @@ +--- +"@latticexyz/world": major +--- + +Moves World interfaces and factories files for consistency with our other packages. + +If you import any World interfaces or factories directly, you'll need to update the import path: + +```diff +- import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol"; ++ import { IBaseWorld } from "@latticexyz/world/src/IBaseWorld.sol"; +``` + +```diff +- import { IBaseWorld } from "@latticexyz/world/src/factories/WorldFactory.sol"; ++ import { IBaseWorld } from "@latticexyz/world/src/WorldFactory.sol"; +``` diff --git a/packages/world-modules/src/interfaces/IBaseWorld.sol b/packages/world-modules/src/interfaces/IBaseWorld.sol index b0f32edd50..f29e3b53db 100644 --- a/packages/world-modules/src/interfaces/IBaseWorld.sol +++ b/packages/world-modules/src/interfaces/IBaseWorld.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.21; /* Autogenerated file. Do not edit manually. */ import { IStore } from "@latticexyz/store/src/IStore.sol"; -import { IWorldKernel } from "@latticexyz/world/src/interfaces/IWorldKernel.sol"; +import { IWorldKernel } from "@latticexyz/world/src/IWorldKernel.sol"; /** * The IBaseWorld interface includes all systems dynamically added to the World diff --git a/packages/world-modules/test/StandardDelegationsModule.t.sol b/packages/world-modules/test/StandardDelegationsModule.t.sol index df5932592e..4734a7751d 100644 --- a/packages/world-modules/test/StandardDelegationsModule.t.sol +++ b/packages/world-modules/test/StandardDelegationsModule.t.sol @@ -10,8 +10,8 @@ import { System } from "@latticexyz/world/src/System.sol"; import { RESOURCE_SYSTEM } from "@latticexyz/world/src/worldResourceTypes.sol"; import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol"; -import { IWorldErrors } from "@latticexyz/world/src/interfaces/IWorldErrors.sol"; -import { DELEGATION_CONTROL_INTERFACE_ID } from "@latticexyz/world/src/interfaces/IDelegationControl.sol"; +import { IWorldErrors } from "@latticexyz/world/src/IWorldErrors.sol"; +import { DELEGATION_CONTROL_INTERFACE_ID } from "@latticexyz/world/src/IDelegationControl.sol"; import { CoreModule } from "@latticexyz/world/src/modules/core/CoreModule.sol"; import { Systems } from "@latticexyz/world/src/codegen/tables/Systems.sol"; diff --git a/packages/world-modules/test/UniqueEntityModule.t.sol b/packages/world-modules/test/UniqueEntityModule.t.sol index cbbe46f591..0f5c4e3bb6 100644 --- a/packages/world-modules/test/UniqueEntityModule.t.sol +++ b/packages/world-modules/test/UniqueEntityModule.t.sol @@ -6,7 +6,7 @@ import { GasReporter } from "@latticexyz/gas-report/src/GasReporter.sol"; import { World } from "@latticexyz/world/src/World.sol"; import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol"; -import { IWorldErrors } from "@latticexyz/world/src/interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "@latticexyz/world/src/IWorldErrors.sol"; import { CoreModule } from "@latticexyz/world/src/modules/core/CoreModule.sol"; import { UniqueEntityModule } from "../src/modules/uniqueentity/UniqueEntityModule.sol"; diff --git a/packages/world/src/AccessControl.sol b/packages/world/src/AccessControl.sol index 1ff2826aab..b6421af7bc 100644 --- a/packages/world/src/AccessControl.sol +++ b/packages/world/src/AccessControl.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.21; import { ResourceId, WorldResourceIdInstance } from "./WorldResourceId.sol"; -import { IWorldErrors } from "./interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "./IWorldErrors.sol"; import { ResourceAccess } from "./codegen/tables/ResourceAccess.sol"; import { NamespaceOwner } from "./codegen/tables/NamespaceOwner.sol"; diff --git a/packages/world/src/factories/Create2.sol b/packages/world/src/Create2.sol similarity index 100% rename from packages/world/src/factories/Create2.sol rename to packages/world/src/Create2.sol diff --git a/packages/world/src/factories/Create2Factory.sol b/packages/world/src/Create2Factory.sol similarity index 100% rename from packages/world/src/factories/Create2Factory.sol rename to packages/world/src/Create2Factory.sol diff --git a/packages/world/src/Delegation.sol b/packages/world/src/Delegation.sol index 34ce243cc7..96579b736d 100644 --- a/packages/world/src/Delegation.sol +++ b/packages/world/src/Delegation.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.21; import { ResourceId } from "@latticexyz/store/src/ResourceId.sol"; import { UNLIMITED_DELEGATION } from "./constants.sol"; -import { IDelegationControl } from "./interfaces/IDelegationControl.sol"; +import { IDelegationControl } from "./IDelegationControl.sol"; import { SystemCall } from "./SystemCall.sol"; library Delegation { diff --git a/packages/world/src/DelegationControl.sol b/packages/world/src/DelegationControl.sol index b5e7519518..f367d77c12 100644 --- a/packages/world/src/DelegationControl.sol +++ b/packages/world/src/DelegationControl.sol @@ -2,9 +2,9 @@ pragma solidity >=0.8.21; import { WorldContextConsumer } from "./WorldContext.sol"; -import { IDelegationControl, DELEGATION_CONTROL_INTERFACE_ID } from "./interfaces/IDelegationControl.sol"; -import { WORLD_CONTEXT_CONSUMER_INTERFACE_ID } from "./interfaces/IWorldContextConsumer.sol"; -import { IERC165, ERC165_INTERFACE_ID } from "./interfaces/IERC165.sol"; +import { IDelegationControl, DELEGATION_CONTROL_INTERFACE_ID } from "./IDelegationControl.sol"; +import { WORLD_CONTEXT_CONSUMER_INTERFACE_ID } from "./IWorldContextConsumer.sol"; +import { IERC165, ERC165_INTERFACE_ID } from "./IERC165.sol"; abstract contract DelegationControl is WorldContextConsumer, IDelegationControl { function supportsInterface( diff --git a/packages/world/src/interfaces/IDelegationControl.sol b/packages/world/src/IDelegationControl.sol similarity index 90% rename from packages/world/src/interfaces/IDelegationControl.sol rename to packages/world/src/IDelegationControl.sol index 113a4fa6d0..c6ba5c3f7f 100644 --- a/packages/world/src/interfaces/IDelegationControl.sol +++ b/packages/world/src/IDelegationControl.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.21; import { IWorldContextConsumer, WORLD_CONTEXT_CONSUMER_INTERFACE_ID } from "./IWorldContextConsumer.sol"; -import { ResourceId } from "../WorldResourceId.sol"; +import { ResourceId } from "./WorldResourceId.sol"; // ERC-165 Interface ID (see https://eips.ethereum.org/EIPS/eip-165) bytes4 constant DELEGATION_CONTROL_INTERFACE_ID = IDelegationControl.verify.selector ^ diff --git a/packages/world/src/interfaces/IERC165.sol b/packages/world/src/IERC165.sol similarity index 100% rename from packages/world/src/interfaces/IERC165.sol rename to packages/world/src/IERC165.sol diff --git a/packages/world/src/interfaces/IModule.sol b/packages/world/src/IModule.sol similarity index 100% rename from packages/world/src/interfaces/IModule.sol rename to packages/world/src/IModule.sol diff --git a/packages/world/src/interfaces/ISystemHook.sol b/packages/world/src/ISystemHook.sol similarity index 91% rename from packages/world/src/interfaces/ISystemHook.sol rename to packages/world/src/ISystemHook.sol index 47739051ab..c0e467745c 100644 --- a/packages/world/src/interfaces/ISystemHook.sol +++ b/packages/world/src/ISystemHook.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.21; import { IERC165, ERC165_INTERFACE_ID } from "./IERC165.sol"; -import { ResourceId } from "../WorldResourceId.sol"; +import { ResourceId } from "./WorldResourceId.sol"; // ERC-165 Interface ID (see https://eips.ethereum.org/EIPS/eip-165) bytes4 constant SYSTEM_HOOK_INTERFACE_ID = ISystemHook.onBeforeCallSystem.selector ^ diff --git a/packages/world/src/interfaces/IWorldContextConsumer.sol b/packages/world/src/IWorldContextConsumer.sol similarity index 100% rename from packages/world/src/interfaces/IWorldContextConsumer.sol rename to packages/world/src/IWorldContextConsumer.sol diff --git a/packages/world/src/interfaces/IWorldErrors.sol b/packages/world/src/IWorldErrors.sol similarity index 100% rename from packages/world/src/interfaces/IWorldErrors.sol rename to packages/world/src/IWorldErrors.sol diff --git a/packages/world/src/factories/IWorldFactory.sol b/packages/world/src/IWorldFactory.sol similarity index 100% rename from packages/world/src/factories/IWorldFactory.sol rename to packages/world/src/IWorldFactory.sol diff --git a/packages/world/src/interfaces/IWorldKernel.sol b/packages/world/src/IWorldKernel.sol similarity index 97% rename from packages/world/src/interfaces/IWorldKernel.sol rename to packages/world/src/IWorldKernel.sol index 2c01631bc5..b3048b351a 100644 --- a/packages/world/src/interfaces/IWorldKernel.sol +++ b/packages/world/src/IWorldKernel.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.21; import { IWorldErrors } from "./IWorldErrors.sol"; import { IModule } from "./IModule.sol"; -import { ResourceId } from "../WorldResourceId.sol"; +import { ResourceId } from "./WorldResourceId.sol"; interface IWorldModuleInstallation { /** diff --git a/packages/world/src/Module.sol b/packages/world/src/Module.sol index 037b62aca6..0914a155bd 100644 --- a/packages/world/src/Module.sol +++ b/packages/world/src/Module.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.21; import { WorldContextConsumer } from "./WorldContext.sol"; -import { IModule, MODULE_INTERFACE_ID } from "./interfaces/IModule.sol"; -import { IERC165, ERC165_INTERFACE_ID } from "./interfaces/IERC165.sol"; +import { IModule, MODULE_INTERFACE_ID } from "./IModule.sol"; +import { IERC165, ERC165_INTERFACE_ID } from "./IERC165.sol"; abstract contract Module is IModule, WorldContextConsumer { // ERC-165 supportsInterface (see https://eips.ethereum.org/EIPS/eip-165) diff --git a/packages/world/src/SystemCall.sol b/packages/world/src/SystemCall.sol index e920d5c5f4..d5cd06a788 100644 --- a/packages/world/src/SystemCall.sol +++ b/packages/world/src/SystemCall.sol @@ -11,8 +11,8 @@ import { WorldContextProvider } from "./WorldContext.sol"; import { revertWithBytes } from "./revertWithBytes.sol"; import { BEFORE_CALL_SYSTEM, AFTER_CALL_SYSTEM } from "./systemHookTypes.sol"; -import { IWorldErrors } from "./interfaces/IWorldErrors.sol"; -import { ISystemHook } from "./interfaces/ISystemHook.sol"; +import { IWorldErrors } from "./IWorldErrors.sol"; +import { ISystemHook } from "./ISystemHook.sol"; import { FunctionSelectors } from "./codegen/tables/FunctionSelectors.sol"; import { Systems } from "./codegen/tables/Systems.sol"; diff --git a/packages/world/src/SystemHook.sol b/packages/world/src/SystemHook.sol index ee8ba08e3b..59f0bd13dd 100644 --- a/packages/world/src/SystemHook.sol +++ b/packages/world/src/SystemHook.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.21; -import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "./interfaces/ISystemHook.sol"; -import { ERC165_INTERFACE_ID } from "./interfaces/IERC165.sol"; +import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "./ISystemHook.sol"; +import { ERC165_INTERFACE_ID } from "./IERC165.sol"; abstract contract SystemHook is ISystemHook { // ERC-165 supportsInterface (see https://eips.ethereum.org/EIPS/eip-165) diff --git a/packages/world/src/World.sol b/packages/world/src/World.sol index 9c7fd2277e..ed3917430b 100644 --- a/packages/world/src/World.sol +++ b/packages/world/src/World.sol @@ -25,9 +25,9 @@ import { InstalledModules } from "./codegen/tables/InstalledModules.sol"; import { UserDelegationControl } from "./codegen/tables/UserDelegationControl.sol"; import { NamespaceDelegationControl } from "./codegen/tables/NamespaceDelegationControl.sol"; -import { IModule, MODULE_INTERFACE_ID } from "./interfaces/IModule.sol"; -import { IWorldKernel } from "./interfaces/IWorldKernel.sol"; -import { IDelegationControl } from "./interfaces/IDelegationControl.sol"; +import { IModule, MODULE_INTERFACE_ID } from "./IModule.sol"; +import { IWorldKernel } from "./IWorldKernel.sol"; +import { IDelegationControl } from "./IDelegationControl.sol"; import { Systems } from "./codegen/tables/Systems.sol"; import { SystemHooks } from "./codegen/tables/SystemHooks.sol"; diff --git a/packages/world/src/WorldContext.sol b/packages/world/src/WorldContext.sol index 03fb9c1bdd..525ab48f2c 100644 --- a/packages/world/src/WorldContext.sol +++ b/packages/world/src/WorldContext.sol @@ -3,8 +3,8 @@ pragma solidity >=0.8.21; import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol"; import { revertWithBytes } from "./revertWithBytes.sol"; -import { ERC165_INTERFACE_ID } from "./interfaces/IERC165.sol"; -import { IWorldContextConsumer, WORLD_CONTEXT_CONSUMER_INTERFACE_ID } from "./interfaces/IWorldContextConsumer.sol"; +import { ERC165_INTERFACE_ID } from "./IERC165.sol"; +import { IWorldContextConsumer, WORLD_CONTEXT_CONSUMER_INTERFACE_ID } from "./IWorldContextConsumer.sol"; // The context size is 20 bytes for msg.sender, and 32 bytes for msg.value uint256 constant CONTEXT_BYTES = 20 + 32; diff --git a/packages/world/src/factories/WorldFactory.sol b/packages/world/src/WorldFactory.sol similarity index 80% rename from packages/world/src/factories/WorldFactory.sol rename to packages/world/src/WorldFactory.sol index 674bc525a5..41c954d5e0 100644 --- a/packages/world/src/factories/WorldFactory.sol +++ b/packages/world/src/WorldFactory.sol @@ -2,11 +2,11 @@ pragma solidity >=0.8.21; import { Create2 } from "./Create2.sol"; -import { World } from "../World.sol"; +import { World } from "./World.sol"; import { IWorldFactory } from "./IWorldFactory.sol"; -import { IBaseWorld } from "../codegen/interfaces/IBaseWorld.sol"; -import { IModule } from "../interfaces/IModule.sol"; -import { ROOT_NAMESPACE_ID } from "../constants.sol"; +import { IBaseWorld } from "./codegen/interfaces/IBaseWorld.sol"; +import { IModule } from "./IModule.sol"; +import { ROOT_NAMESPACE_ID } from "./constants.sol"; contract WorldFactory is IWorldFactory { IModule public coreModule; diff --git a/packages/world/src/codegen/interfaces/IBaseWorld.sol b/packages/world/src/codegen/interfaces/IBaseWorld.sol index a8112b5dc0..4d0e1d410d 100644 --- a/packages/world/src/codegen/interfaces/IBaseWorld.sol +++ b/packages/world/src/codegen/interfaces/IBaseWorld.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.21; /* Autogenerated file. Do not edit manually. */ import { IStore } from "@latticexyz/store/src/IStore.sol"; -import { IWorldKernel } from "../../interfaces/IWorldKernel.sol"; +import { IWorldKernel } from "../../IWorldKernel.sol"; import { ICoreSystem } from "./ICoreSystem.sol"; import { IAccessManagementSystem } from "./IAccessManagementSystem.sol"; diff --git a/packages/world/src/codegen/interfaces/IModuleInstallationSystem.sol b/packages/world/src/codegen/interfaces/IModuleInstallationSystem.sol index 90642ad230..4ee64a9a70 100644 --- a/packages/world/src/codegen/interfaces/IModuleInstallationSystem.sol +++ b/packages/world/src/codegen/interfaces/IModuleInstallationSystem.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.21; /* Autogenerated file. Do not edit manually. */ -import { IModule } from "./../../interfaces/IModule.sol"; +import { IModule } from "./../../IModule.sol"; interface IModuleInstallationSystem { function installModule(IModule module, bytes memory args) external; diff --git a/packages/world/src/codegen/interfaces/IWorldRegistrationSystem.sol b/packages/world/src/codegen/interfaces/IWorldRegistrationSystem.sol index 65e45dc70e..6db9cffd04 100644 --- a/packages/world/src/codegen/interfaces/IWorldRegistrationSystem.sol +++ b/packages/world/src/codegen/interfaces/IWorldRegistrationSystem.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.21; /* Autogenerated file. Do not edit manually. */ import { ResourceId } from "@latticexyz/store/src/ResourceId.sol"; -import { ISystemHook } from "./../../interfaces/ISystemHook.sol"; +import { ISystemHook } from "./../../ISystemHook.sol"; import { WorldContextConsumer } from "./../../WorldContext.sol"; interface IWorldRegistrationSystem { diff --git a/packages/world/src/modules/core/CoreSystem.sol b/packages/world/src/modules/core/CoreSystem.sol index 875145cc47..cfee17d1d2 100644 --- a/packages/world/src/modules/core/CoreSystem.sol +++ b/packages/world/src/modules/core/CoreSystem.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.21; -import { IWorldErrors } from "../../interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../../IWorldErrors.sol"; import { AccessManagementSystem } from "./implementations/AccessManagementSystem.sol"; import { BalanceTransferSystem } from "./implementations/BalanceTransferSystem.sol"; diff --git a/packages/world/src/modules/core/implementations/AccessManagementSystem.sol b/packages/world/src/modules/core/implementations/AccessManagementSystem.sol index af1c91b80b..f259b944c0 100644 --- a/packages/world/src/modules/core/implementations/AccessManagementSystem.sol +++ b/packages/world/src/modules/core/implementations/AccessManagementSystem.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.21; -import { IModule } from "../../../interfaces/IModule.sol"; +import { IModule } from "../../../IModule.sol"; import { System } from "../../../System.sol"; import { AccessControl } from "../../../AccessControl.sol"; import { ResourceId, WorldResourceIdLib } from "../../../WorldResourceId.sol"; diff --git a/packages/world/src/modules/core/implementations/BalanceTransferSystem.sol b/packages/world/src/modules/core/implementations/BalanceTransferSystem.sol index 5ba705fe6d..fedf89a93e 100644 --- a/packages/world/src/modules/core/implementations/BalanceTransferSystem.sol +++ b/packages/world/src/modules/core/implementations/BalanceTransferSystem.sol @@ -8,7 +8,7 @@ import { revertWithBytes } from "../../../revertWithBytes.sol"; import { WorldResourceIdLib, WorldResourceIdInstance } from "../../../WorldResourceId.sol"; import { AccessControl } from "../../../AccessControl.sol"; import { RESOURCE_NAMESPACE } from "../../../worldResourceTypes.sol"; -import { IWorldErrors } from "../../../interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../../../IWorldErrors.sol"; import { Balances } from "../../../codegen/tables/Balances.sol"; diff --git a/packages/world/src/modules/core/implementations/ModuleInstallationSystem.sol b/packages/world/src/modules/core/implementations/ModuleInstallationSystem.sol index f507a322a6..69fa9f3fbb 100644 --- a/packages/world/src/modules/core/implementations/ModuleInstallationSystem.sol +++ b/packages/world/src/modules/core/implementations/ModuleInstallationSystem.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.21; -import { IModule, MODULE_INTERFACE_ID } from "../../../interfaces/IModule.sol"; +import { IModule, MODULE_INTERFACE_ID } from "../../../IModule.sol"; import { System } from "../../../System.sol"; import { AccessControl } from "../../../AccessControl.sol"; import { WorldContextProvider } from "../../../WorldContext.sol"; diff --git a/packages/world/src/modules/core/implementations/StoreRegistrationSystem.sol b/packages/world/src/modules/core/implementations/StoreRegistrationSystem.sol index 0f3eb9f6f6..77fcbad182 100644 --- a/packages/world/src/modules/core/implementations/StoreRegistrationSystem.sol +++ b/packages/world/src/modules/core/implementations/StoreRegistrationSystem.sol @@ -22,7 +22,7 @@ import { SystemRegistry } from "../../../codegen/tables/SystemRegistry.sol"; import { Systems } from "../../../codegen/tables/Systems.sol"; import { FunctionSelectors } from "../../../codegen/tables/FunctionSelectors.sol"; -import { IWorldErrors } from "../../../interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../../../IWorldErrors.sol"; import { CORE_SYSTEM_ID } from "../constants.sol"; diff --git a/packages/world/src/modules/core/implementations/WorldRegistrationSystem.sol b/packages/world/src/modules/core/implementations/WorldRegistrationSystem.sol index 766fafac01..9c969f67db 100644 --- a/packages/world/src/modules/core/implementations/WorldRegistrationSystem.sol +++ b/packages/world/src/modules/core/implementations/WorldRegistrationSystem.sol @@ -18,9 +18,9 @@ import { NamespaceOwner } from "../../../codegen/tables/NamespaceOwner.sol"; import { ResourceAccess } from "../../../codegen/tables/ResourceAccess.sol"; import { UserDelegationControl } from "../../../codegen/tables/UserDelegationControl.sol"; import { NamespaceDelegationControl } from "../../../codegen/tables/NamespaceDelegationControl.sol"; -import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "../../../interfaces/ISystemHook.sol"; -import { IWorldErrors } from "../../../interfaces/IWorldErrors.sol"; -import { IDelegationControl, DELEGATION_CONTROL_INTERFACE_ID } from "../../../interfaces/IDelegationControl.sol"; +import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "../../../ISystemHook.sol"; +import { IWorldErrors } from "../../../IWorldErrors.sol"; +import { IDelegationControl, DELEGATION_CONTROL_INTERFACE_ID } from "../../../IDelegationControl.sol"; import { SystemHooks, SystemHooksTableId } from "../../../codegen/tables/SystemHooks.sol"; import { SystemRegistry } from "../../../codegen/tables/SystemRegistry.sol"; diff --git a/packages/world/src/requireInterface.sol b/packages/world/src/requireInterface.sol index 10c927e163..66f0b73a85 100644 --- a/packages/world/src/requireInterface.sol +++ b/packages/world/src/requireInterface.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity >=0.8.21; -import { IERC165 } from "./interfaces/IERC165.sol"; -import { IWorldErrors } from "./interfaces/IWorldErrors.sol"; +import { IERC165 } from "./IERC165.sol"; +import { IWorldErrors } from "./IWorldErrors.sol"; /** * Require the given contract to support the given interface by calling the ERC-165 supportsInterface function. diff --git a/packages/world/test/AccessControl.t.sol b/packages/world/test/AccessControl.t.sol index b4ef353d35..ad6e555818 100644 --- a/packages/world/test/AccessControl.t.sol +++ b/packages/world/test/AccessControl.t.sol @@ -5,7 +5,7 @@ import "forge-std/Test.sol"; import { GasReporter } from "@latticexyz/gas-report/src/GasReporter.sol"; import { StoreMock } from "@latticexyz/store/test/StoreMock.sol"; -import { IWorldErrors } from "../src/interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../src/IWorldErrors.sol"; import { World } from "../src/World.sol"; import { AccessControl } from "../src/AccessControl.sol"; import { ResourceId, WorldResourceIdLib, WorldResourceIdInstance } from "../src/WorldResourceId.sol"; diff --git a/packages/world/test/BatchCall.t.sol b/packages/world/test/BatchCall.t.sol index 2380a18c25..099f32ae59 100644 --- a/packages/world/test/BatchCall.t.sol +++ b/packages/world/test/BatchCall.t.sol @@ -11,7 +11,7 @@ import { UNLIMITED_DELEGATION } from "../src/constants.sol"; import { ResourceId, WorldResourceIdLib } from "../src/WorldResourceId.sol"; import { RESOURCE_SYSTEM } from "../src/worldResourceTypes.sol"; -import { IWorldErrors } from "../src/interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../src/IWorldErrors.sol"; import { IBaseWorld } from "../src/codegen/interfaces/IBaseWorld.sol"; import { CoreModule } from "../src/modules/core/CoreModule.sol"; import { SystemCallData, SystemCallFromData } from "../src/modules/core/types.sol"; diff --git a/packages/world/test/Factories.t.sol b/packages/world/test/Factories.t.sol index c6ae016ba0..8ba557752c 100644 --- a/packages/world/test/Factories.t.sol +++ b/packages/world/test/Factories.t.sol @@ -9,9 +9,9 @@ import { World } from "../src/World.sol"; import { ResourceId } from "../src/WorldResourceId.sol"; import { CoreModule } from "../src/modules/core/CoreModule.sol"; import { CORE_MODULE_NAME } from "../src/modules/core/constants.sol"; -import { Create2Factory } from "../src/factories/Create2Factory.sol"; -import { WorldFactory } from "../src/factories/WorldFactory.sol"; -import { IWorldFactory } from "../src/factories/IWorldFactory.sol"; +import { Create2Factory } from "../src/Create2Factory.sol"; +import { WorldFactory } from "../src/WorldFactory.sol"; +import { IWorldFactory } from "../src/IWorldFactory.sol"; import { InstalledModules } from "../src/codegen/tables/InstalledModules.sol"; import { NamespaceOwner } from "../src/codegen/tables/NamespaceOwner.sol"; import { ROOT_NAMESPACE_ID } from "../src/constants.sol"; diff --git a/packages/world/test/SystemHook.t.sol b/packages/world/test/SystemHook.t.sol index ef8d834d44..7e1062e0fa 100644 --- a/packages/world/test/SystemHook.t.sol +++ b/packages/world/test/SystemHook.t.sol @@ -6,7 +6,7 @@ import { GasReporter } from "@latticexyz/gas-report/src/GasReporter.sol"; import { Hook, HookLib } from "@latticexyz/store/src/Hook.sol"; import { BEFORE_CALL_SYSTEM, AFTER_CALL_SYSTEM, ALL } from "../src/systemHookTypes.sol"; -import { ISystemHook } from "../src/interfaces/ISystemHook.sol"; +import { ISystemHook } from "../src/ISystemHook.sol"; contract SystemHookTest is Test, GasReporter { function testFuzzEncode(address hookAddress, bool enableBeforeCallSystem, bool enableAfterCallSystem) public { diff --git a/packages/world/test/World.t.sol b/packages/world/test/World.t.sol index d6331b04fe..eb22836447 100644 --- a/packages/world/test/World.t.sol +++ b/packages/world/test/World.t.sol @@ -43,8 +43,8 @@ import { SystemRegistry } from "../src/codegen/tables/SystemRegistry.sol"; import { FunctionSelectors } from "../src/codegen/tables/FunctionSelectors.sol"; import { IBaseWorld } from "../src/codegen/interfaces/IBaseWorld.sol"; -import { IWorldErrors } from "../src/interfaces/IWorldErrors.sol"; -import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "../src/interfaces/ISystemHook.sol"; +import { IWorldErrors } from "../src/IWorldErrors.sol"; +import { ISystemHook, SYSTEM_HOOK_INTERFACE_ID } from "../src/ISystemHook.sol"; import { Bool } from "./codegen/tables/Bool.sol"; import { TwoFields, TwoFieldsData } from "./codegen/tables/TwoFields.sol"; diff --git a/packages/world/test/WorldBalance.t.sol b/packages/world/test/WorldBalance.t.sol index a6f2bf521f..3ea58da830 100644 --- a/packages/world/test/WorldBalance.t.sol +++ b/packages/world/test/WorldBalance.t.sol @@ -10,7 +10,7 @@ import { ResourceId, WorldResourceIdLib, WorldResourceIdInstance } from "../src/ import { ROOT_NAMESPACE, ROOT_NAMESPACE_ID } from "../src/constants.sol"; import { CoreModule } from "../src/modules/core/CoreModule.sol"; import { Balances } from "../src/codegen/tables/Balances.sol"; -import { IWorldErrors } from "../src/interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../src/IWorldErrors.sol"; import { RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "../src/worldResourceTypes.sol"; using WorldResourceIdInstance for ResourceId; diff --git a/packages/world/test/WorldDynamicUpdate.t.sol b/packages/world/test/WorldDynamicUpdate.t.sol index 1427669b85..15c805a8e6 100644 --- a/packages/world/test/WorldDynamicUpdate.t.sol +++ b/packages/world/test/WorldDynamicUpdate.t.sol @@ -24,7 +24,7 @@ import { AddressArray } from "./codegen/tables/AddressArray.sol"; import { CoreModule } from "../src/modules/core/CoreModule.sol"; import { IBaseWorld } from "../src/codegen/interfaces/IBaseWorld.sol"; -import { IWorldErrors } from "../src/interfaces/IWorldErrors.sol"; +import { IWorldErrors } from "../src/IWorldErrors.sol"; contract UpdateInDynamicFieldTest is Test, GasReporter { using WorldResourceIdInstance for ResourceId; diff --git a/packages/world/ts/node/render-solidity/renderWorld.ts b/packages/world/ts/node/render-solidity/renderWorld.ts index 95233cf281..add92e5676 100644 --- a/packages/world/ts/node/render-solidity/renderWorld.ts +++ b/packages/world/ts/node/render-solidity/renderWorld.ts @@ -13,7 +13,7 @@ export function renderWorld(options: RenderWorldOptions) { interfaceName === "IBaseWorld" ? [ { symbol: "IStore", path: `${storeImportPath}IStore.sol` }, - { symbol: "IWorldKernel", path: `${worldImportPath}interfaces/IWorldKernel.sol` }, + { symbol: "IWorldKernel", path: `${worldImportPath}IWorldKernel.sol` }, ] : [ {