Merge pull request #36 from symbioticfi/relative-paths-fix

Add missing relative paths
symbioticfi · Sep 9, 2024 · 8333f3e · 8333f3e
2 parents 70d30d8 + f7590b0
commit 8333f3e
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 57 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@symbioticfi/core",
-  "version": "1.0.0-devnet.4",
+  "version": "1.0.0-devnet.5",
   "description": "Symbiotic is a shared security protocol enabling decentralized networks to control and customize their own multi-asset restaking implementation.",
   "homepage": "https://symbiotic.fi/",
   "bugs": "https://github.com/symbioticfi/core/issues",

diff --git a/src/interfaces/delegator/IBaseDelegator.sol b/src/interfaces/delegator/IBaseDelegator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IEntity} from "src/interfaces/common/IEntity.sol";
+import {IEntity} from "../common/IEntity.sol";
 
 interface IBaseDelegator is IEntity {
     error AlreadySet();

diff --git a/src/interfaces/slasher/IBaseSlasher.sol b/src/interfaces/slasher/IBaseSlasher.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IEntity} from "src/interfaces/common/IEntity.sol";
+import {IEntity} from "../common/IEntity.sol";
 
 interface IBaseSlasher is IEntity {
     error NotNetworkMiddleware();

diff --git a/src/interfaces/vault/IVault.sol b/src/interfaces/vault/IVault.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IMigratableEntity} from "src/interfaces/common/IMigratableEntity.sol";
+import {IMigratableEntity} from "../common/IMigratableEntity.sol";
 import {IVaultStorage} from "./IVaultStorage.sol";
 
 interface IVault is IMigratableEntity, IVaultStorage {

diff --git a/test/DelegatorFactory.t.sol b/test/DelegatorFactory.t.sol
@@ -18,7 +18,7 @@ import {FullRestakeDelegator} from "../src/contracts/delegator/FullRestakeDelega
 import {Slasher} from "../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../src/interfaces/vault/IVault.sol";
 
 import {Token} from "./mocks/Token.sol";
 import {VaultConfigurator} from "../src/contracts/VaultConfigurator.sol";

diff --git a/test/POCBase.t.sol b/test/POCBase.t.sol
@@ -18,10 +18,10 @@ import {FullRestakeDelegator} from "../src/contracts/delegator/FullRestakeDelega
 import {Slasher} from "../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../src/interfaces/vault/IVault.sol";
 
-import {Token} from "test/mocks/Token.sol";
-import {FeeOnTransferToken} from "test/mocks/FeeOnTransferToken.sol";
+import {Token} from "./mocks/Token.sol";
+import {FeeOnTransferToken} from "./mocks/FeeOnTransferToken.sol";
 import {VaultConfigurator} from "../src/contracts/VaultConfigurator.sol";
 import {IVaultConfigurator} from "../src/interfaces/IVaultConfigurator.sol";
 import {INetworkRestakeDelegator} from "../src/interfaces/delegator/INetworkRestakeDelegator.sol";

diff --git a/test/SlasherFactory.t.sol b/test/SlasherFactory.t.sol
@@ -18,7 +18,7 @@ import {FullRestakeDelegator} from "../src/contracts/delegator/FullRestakeDelega
 import {Slasher} from "../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../src/interfaces/vault/IVault.sol";
 
 import {Token} from "./mocks/Token.sol";
 import {VaultConfigurator} from "../src/contracts/VaultConfigurator.sol";

diff --git a/test/VaultConfigurator.t.sol b/test/VaultConfigurator.t.sol
@@ -18,7 +18,7 @@ import {FullRestakeDelegator} from "../src/contracts/delegator/FullRestakeDelega
 import {Slasher} from "../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../src/interfaces/vault/IVault.sol";
 
 import {Token} from "./mocks/Token.sol";
 import {VaultConfigurator} from "../src/contracts/VaultConfigurator.sol";

diff --git a/test/VaultFactory.t.sol b/test/VaultFactory.t.sol
@@ -18,7 +18,7 @@ import {FullRestakeDelegator} from "../src/contracts/delegator/FullRestakeDelega
 import {Slasher} from "../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../src/interfaces/vault/IVault.sol";
 
 import {Token} from "./mocks/Token.sol";
 import {VaultConfigurator} from "../src/contracts/VaultConfigurator.sol";

diff --git a/test/common/Entity.t.sol b/test/common/Entity.t.sol
@@ -8,7 +8,7 @@ import {IFactory} from "../../src/interfaces/common/IFactory.sol";
 
 import {IEntity} from "../../src/interfaces/common/IEntity.sol";
 
-import {SimpleEntity} from "test/mocks/SimpleEntity.sol";
+import {SimpleEntity} from "../mocks/SimpleEntity.sol";
 
 contract EntityTest is Test {
     address owner;

diff --git a/test/common/Factory.t.sol b/test/common/Factory.t.sol
@@ -8,8 +8,8 @@ import {IFactory} from "../../src/interfaces/common/IFactory.sol";
 
 import {IEntity} from "../../src/interfaces/common/IEntity.sol";
 
-import {SimpleEntity} from "test/mocks/SimpleEntity.sol";
-import {FakeEntity} from "test/mocks/FakeEntity.sol";
+import {SimpleEntity} from "../mocks/SimpleEntity.sol";
+import {FakeEntity} from "../mocks/FakeEntity.sol";
 
 contract FactoryTest is Test {
     address owner;

diff --git a/test/common/MigratableEntity.t.sol b/test/common/MigratableEntity.t.sol
@@ -5,16 +5,16 @@ import {Test, console2} from "forge-std/Test.sol";
 
 import {IRegistry} from "../../src/interfaces/common/IRegistry.sol";
 
-import {MigratablesFactory} from "src/contracts/common/MigratablesFactory.sol";
-import {IMigratablesFactory} from "src/interfaces/common/IMigratablesFactory.sol";
-import {IMigratableEntityProxy} from "src/interfaces/common/IMigratableEntityProxy.sol";
+import {MigratablesFactory} from "../../src/contracts/common/MigratablesFactory.sol";
+import {IMigratablesFactory} from "../../src/interfaces/common/IMigratablesFactory.sol";
+import {IMigratableEntityProxy} from "../../src/interfaces/common/IMigratableEntityProxy.sol";
 
 import {IMigratableEntity} from "../../src/interfaces/common/IMigratableEntity.sol";
 
 import {MigratableEntityProxy} from "../../src/contracts/common/MigratableEntityProxy.sol";
 
-import {SimpleMigratableEntity} from "test/mocks/SimpleMigratableEntity.sol";
-import {SimpleMigratableEntityV2} from "test/mocks/SimpleMigratableEntityV2.sol";
+import {SimpleMigratableEntity} from "../mocks/SimpleMigratableEntity.sol";
+import {SimpleMigratableEntityV2} from "../mocks/SimpleMigratableEntityV2.sol";
 
 contract MigratableEntityTest is Test {
     address owner;

diff --git a/test/common/MigratableEntityProxy.t.sol b/test/common/MigratableEntityProxy.t.sol
@@ -12,8 +12,8 @@ import {IMigratableEntity} from "../../src/interfaces/common/IMigratableEntity.s
 
 import {MigratableEntityProxy} from "../../src/contracts/common/MigratableEntityProxy.sol";
 
-import {SimpleMigratableEntity} from "test/mocks/SimpleMigratableEntity.sol";
-import {SimpleMigratableEntityV2} from "test/mocks/SimpleMigratableEntityV2.sol";
+import {SimpleMigratableEntity} from "../mocks/SimpleMigratableEntity.sol";
+import {SimpleMigratableEntityV2} from "../mocks/SimpleMigratableEntityV2.sol";
 
 contract MigratableEntityProxyTest is Test {
     address owner;

diff --git a/test/common/MigratablesFactory.t.sol b/test/common/MigratablesFactory.t.sol
@@ -8,8 +8,8 @@ import {IRegistry} from "../../src/interfaces/common/IRegistry.sol";
 import {MigratablesFactory} from "../../src/contracts/common/MigratablesFactory.sol";
 import {IMigratablesFactory} from "../../src/interfaces/common/IMigratablesFactory.sol";
 
-import {SimpleMigratableEntity} from "test/mocks/SimpleMigratableEntity.sol";
-import {SimpleMigratableEntityV2} from "test/mocks/SimpleMigratableEntityV2.sol";
+import {SimpleMigratableEntity} from "../mocks/SimpleMigratableEntity.sol";
+import {SimpleMigratableEntityV2} from "../mocks/SimpleMigratableEntityV2.sol";
 
 contract MigratablesFactoryTest is Test {
     address owner;

diff --git a/test/common/Registry.t.sol b/test/common/Registry.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import {Test, console2} from "forge-std/Test.sol";
 
-import {SimpleRegistry} from "test/mocks/SimpleRegistry.sol";
+import {SimpleRegistry} from "../mocks/SimpleRegistry.sol";
 
 contract FactoryTest is Test {
     address owner;

diff --git a/test/delegator/FullRestakeDelegator.t.sol b/test/delegator/FullRestakeDelegator.t.sol
@@ -18,19 +18,19 @@ import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDel
 import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
 
-import {Token} from "test/mocks/Token.sol";
-import {VaultConfigurator} from "src/contracts/VaultConfigurator.sol";
-import {IVaultConfigurator} from "src/interfaces/IVaultConfigurator.sol";
-import {INetworkRestakeDelegator} from "src/interfaces/delegator/INetworkRestakeDelegator.sol";
-import {IFullRestakeDelegator} from "src/interfaces/delegator/IFullRestakeDelegator.sol";
-import {IBaseDelegator} from "src/interfaces/delegator/IBaseDelegator.sol";
-import {ISlasher} from "src/interfaces/slasher/ISlasher.sol";
+import {Token} from "../mocks/Token.sol";
+import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
+import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
+import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";
+import {IFullRestakeDelegator} from "../../src/interfaces/delegator/IFullRestakeDelegator.sol";
+import {IBaseDelegator} from "../../src/interfaces/delegator/IBaseDelegator.sol";
+import {ISlasher} from "../../src/interfaces/slasher/ISlasher.sol";
 
 import {IVaultStorage} from "../../src/interfaces/vault/IVaultStorage.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {SimpleFullRestakeDelegatorHook} from "test/mocks/SimpleFullRestakeDelegatorHook.sol";
+import {SimpleFullRestakeDelegatorHook} from "../mocks/SimpleFullRestakeDelegatorHook.sol";
 
 import {BaseDelegatorHints, FullRestakeDelegatorHints} from "../../src/contracts/hints/DelegatorHints.sol";
 import {OptInServiceHints} from "../../src/contracts/hints/OptInServiceHints.sol";

diff --git a/test/delegator/NetworkRestakeDelegator.t.sol b/test/delegator/NetworkRestakeDelegator.t.sol
@@ -18,19 +18,19 @@ import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDel
 import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
 
-import {Token} from "test/mocks/Token.sol";
-import {VaultConfigurator} from "src/contracts/VaultConfigurator.sol";
-import {IVaultConfigurator} from "src/interfaces/IVaultConfigurator.sol";
-import {INetworkRestakeDelegator} from "src/interfaces/delegator/INetworkRestakeDelegator.sol";
-import {IFullRestakeDelegator} from "src/interfaces/delegator/IFullRestakeDelegator.sol";
-import {IBaseDelegator} from "src/interfaces/delegator/IBaseDelegator.sol";
-import {ISlasher} from "src/interfaces/slasher/ISlasher.sol";
+import {Token} from "../mocks/Token.sol";
+import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
+import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
+import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";
+import {IFullRestakeDelegator} from "../../src/interfaces/delegator/IFullRestakeDelegator.sol";
+import {IBaseDelegator} from "../../src/interfaces/delegator/IBaseDelegator.sol";
+import {ISlasher} from "../../src/interfaces/slasher/ISlasher.sol";
 
 import {IVaultStorage} from "../../src/interfaces/vault/IVaultStorage.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {SimpleNetworkRestakeDelegatorHook} from "test/mocks/SimpleNetworkRestakeDelegatorHook.sol";
+import {SimpleNetworkRestakeDelegatorHook} from "../mocks/SimpleNetworkRestakeDelegatorHook.sol";
 
 import {BaseDelegatorHints, NetworkRestakeDelegatorHints} from "../../src/contracts/hints/DelegatorHints.sol";
 import {OptInServiceHints} from "../../src/contracts/hints/OptInServiceHints.sol";

diff --git a/test/slasher/Slasher.t.sol b/test/slasher/Slasher.t.sol
@@ -18,9 +18,9 @@ import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDel
 import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
 
-import {Token} from "test/mocks/Token.sol";
+import {Token} from "../mocks/Token.sol";
 import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
 import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
 import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";

diff --git a/test/slasher/VetoSlasher.t.sol b/test/slasher/VetoSlasher.t.sol
@@ -18,16 +18,16 @@ import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDel
 import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
-
-import {Token} from "test/mocks/Token.sol";
-import {VaultConfigurator} from "src/contracts/VaultConfigurator.sol";
-import {IVaultConfigurator} from "src/interfaces/IVaultConfigurator.sol";
-import {INetworkRestakeDelegator} from "src/interfaces/delegator/INetworkRestakeDelegator.sol";
-import {IFullRestakeDelegator} from "src/interfaces/delegator/IFullRestakeDelegator.sol";
-import {IBaseDelegator} from "src/interfaces/delegator/IBaseDelegator.sol";
-import {IMigratableEntityProxy} from "src/interfaces/common/IMigratableEntityProxy.sol";
-import {IMigratableEntity} from "src/interfaces/common/IMigratableEntity.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
+
+import {Token} from "../mocks/Token.sol";
+import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
+import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
+import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";
+import {IFullRestakeDelegator} from "../../src/interfaces/delegator/IFullRestakeDelegator.sol";
+import {IBaseDelegator} from "../../src/interfaces/delegator/IBaseDelegator.sol";
+import {IMigratableEntityProxy} from "../../src/interfaces/common/IMigratableEntityProxy.sol";
+import {IMigratableEntity} from "../../src/interfaces/common/IMigratableEntity.sol";
 
 import {IVaultStorage} from "../../src/interfaces/vault/IVaultStorage.sol";
 import {IVetoSlasher} from "../../src/interfaces/slasher/IVetoSlasher.sol";

diff --git a/test/vault/Vault.t.sol b/test/vault/Vault.t.sol
@@ -18,10 +18,10 @@ import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDel
 import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
 import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {IVault} from "src/interfaces/vault/IVault.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
 
-import {Token} from "test/mocks/Token.sol";
-import {FeeOnTransferToken} from "test/mocks/FeeOnTransferToken.sol";
+import {Token} from "../mocks/Token.sol";
+import {FeeOnTransferToken} from "../mocks/FeeOnTransferToken.sol";
 import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
 import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
 import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";