From b5540716bc29eed6061328a716a9b0e5387263bf Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Mon, 18 Sep 2023 22:19:29 +0100 Subject: [PATCH] refactor(cli,world): clean up unused solidity (#1543) --- packages/cli/contracts/src/codegen/Tables.sol | 10 -------- packages/cli/contracts/src/codegen/Types.sol | 13 ----------- packages/world/src/Tables.sol | 23 ------------------- packages/world/src/Types.sol | 10 -------- packages/world/src/Utils.sol | 2 +- 5 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 packages/cli/contracts/src/codegen/Tables.sol delete mode 100644 packages/cli/contracts/src/codegen/Types.sol delete mode 100644 packages/world/src/Tables.sol delete mode 100644 packages/world/src/Types.sol diff --git a/packages/cli/contracts/src/codegen/Tables.sol b/packages/cli/contracts/src/codegen/Tables.sol deleted file mode 100644 index de034e0789..0000000000 --- a/packages/cli/contracts/src/codegen/Tables.sol +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.0; - -/* Autogenerated file. Do not edit manually. */ - -import { Statics, StaticsData, StaticsTableId } from "./tables/Statics.sol"; -import { Dynamics1, Dynamics1Data, Dynamics1TableId } from "./tables/Dynamics1.sol"; -import { Dynamics2, Dynamics2Data, Dynamics2TableId } from "./tables/Dynamics2.sol"; -import { Singleton, SingletonTableId } from "./tables/Singleton.sol"; -import { Ephemeral, EphemeralTableId } from "./tables/Ephemeral.sol"; diff --git a/packages/cli/contracts/src/codegen/Types.sol b/packages/cli/contracts/src/codegen/Types.sol deleted file mode 100644 index 85fa534462..0000000000 --- a/packages/cli/contracts/src/codegen/Types.sol +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.0; - -/* Autogenerated file. Do not edit manually. */ -enum Enum1 { - E1, - E2, - E3 -} - -enum Enum2 { - E1 -} diff --git a/packages/world/src/Tables.sol b/packages/world/src/Tables.sol deleted file mode 100644 index 021a7371bf..0000000000 --- a/packages/world/src/Tables.sol +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.0; - -/* Autogenerated file. Do not edit manually. */ - -import { NamespaceOwner, NamespaceOwnerTableId } from "./tables/NamespaceOwner.sol"; -import { ResourceAccess, ResourceAccessTableId } from "./tables/ResourceAccess.sol"; -import { InstalledModules, InstalledModulesTableId } from "./tables/InstalledModules.sol"; -import { Delegations, DelegationsTableId } from "./tables/Delegations.sol"; -import { Balances, BalancesTableId } from "./modules/core/tables/Balances.sol"; -import { Systems, SystemsTableId } from "./modules/core/tables/Systems.sol"; -import { SystemRegistry, SystemRegistryTableId } from "./modules/core/tables/SystemRegistry.sol"; -import { SystemHooks, SystemHooksTableId } from "./modules/core/tables/SystemHooks.sol"; -import { ResourceType, ResourceTypeTableId } from "./modules/core/tables/ResourceType.sol"; -import { FunctionSelectors, FunctionSelectorsTableId } from "./modules/core/tables/FunctionSelectors.sol"; -import { KeysWithValue } from "./modules/keyswithvalue/tables/KeysWithValue.sol"; -import { KeysInTable, KeysInTableData, KeysInTableTableId } from "./modules/keysintable/tables/KeysInTable.sol"; -import { UsedKeysIndex, UsedKeysIndexTableId } from "./modules/keysintable/tables/UsedKeysIndex.sol"; -import { UniqueEntity } from "./modules/uniqueentity/tables/UniqueEntity.sol"; -import { CallboundDelegations, CallboundDelegationsTableId } from "./modules/std-delegations/tables/CallboundDelegations.sol"; -import { TimeboundDelegations, TimeboundDelegationsTableId } from "./modules/std-delegations/tables/TimeboundDelegations.sol"; -import { Bool } from "./../test/tables/Bool.sol"; -import { AddressArray } from "./../test/tables/AddressArray.sol"; diff --git a/packages/world/src/Types.sol b/packages/world/src/Types.sol deleted file mode 100644 index 6c4b0ff193..0000000000 --- a/packages/world/src/Types.sol +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity >=0.8.0; - -/* Autogenerated file. Do not edit manually. */ -enum Resource { - NONE, - NAMESPACE, - TABLE, - SYSTEM -} diff --git a/packages/world/src/Utils.sol b/packages/world/src/Utils.sol index dd5a4138dc..b54e5d7653 100644 --- a/packages/world/src/Utils.sol +++ b/packages/world/src/Utils.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.0; import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol"; import { ResourceSelector } from "./ResourceSelector.sol"; -import { SystemRegistry } from "./Tables.sol"; +import { SystemRegistry } from "./index.sol"; library Utils { /**