diff --git a/foundry.toml b/foundry.toml index b61cce6..e608858 100644 --- a/foundry.toml +++ b/foundry.toml @@ -3,6 +3,10 @@ src = "src" out = "out" libs = ["lib"] test = "test" +remappings = [ + "base-std/=src/", + "base-std-test/=test/", +] ast = true solc = "0.8.30" diff --git a/test/lib/ActivationRegistryTest.sol b/test/lib/ActivationRegistryTest.sol index 37cd45f..12df2d9 100644 --- a/test/lib/ActivationRegistryTest.sol +++ b/test/lib/ActivationRegistryTest.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; -import {BaseTest} from "test/lib/BaseTest.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {BaseTest} from "base-std-test/lib/BaseTest.sol"; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; /// @notice Base test contract for `IActivationRegistry` unit tests. /// diff --git a/test/lib/B20AssetTest.sol b/test/lib/B20AssetTest.sol index 54a22ad..7662dda 100644 --- a/test/lib/B20AssetTest.sol +++ b/test/lib/B20AssetTest.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; /// @notice Base test contract for `IB20Asset` unit tests. /// diff --git a/test/lib/B20FactoryLibTest.sol b/test/lib/B20FactoryLibTest.sol index 7eefc7e..b6c7ce7 100644 --- a/test/lib/B20FactoryLibTest.sol +++ b/test/lib/B20FactoryLibTest.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {BaseTest} from "test/lib/BaseTest.sol"; +import {BaseTest} from "base-std-test/lib/BaseTest.sol"; /// @notice Base test contract for `B20FactoryLib` unit tests. /// @@ -16,6 +16,5 @@ import {BaseTest} from "test/lib/BaseTest.sol"; /// helper, even though the library itself does not consult `msg.sender`. /// Re-using those gives the test contracts a uniform vocabulary with /// the rest of the suite. No `setUp` extension is needed. -contract B20FactoryLibTest is BaseTest { - // No additional state; `BaseTest`'s actor labels and helpers are sufficient. -} +/// @dev No additional state; `BaseTest`'s actor labels and helpers are sufficient. +contract B20FactoryLibTest is BaseTest {} diff --git a/test/lib/B20FactoryTest.sol b/test/lib/B20FactoryTest.sol index 13749a3..8933fc5 100644 --- a/test/lib/B20FactoryTest.sol +++ b/test/lib/B20FactoryTest.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {BaseTest} from "test/lib/BaseTest.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {BaseTest} from "base-std-test/lib/BaseTest.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; /// @notice Base test contract for `IB20Factory` unit tests, and the /// parent for token-test bases (`B20Test`, `B20StablecoinTest`) diff --git a/test/lib/B20StablecoinTest.sol b/test/lib/B20StablecoinTest.sol index b683017..d12c44f 100644 --- a/test/lib/B20StablecoinTest.sol +++ b/test/lib/B20StablecoinTest.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; /// @notice Base test contract for `IB20Stablecoin` unit tests. /// diff --git a/test/lib/B20Test.sol b/test/lib/B20Test.sol index 2b1cb82..7ef63d3 100644 --- a/test/lib/B20Test.sol +++ b/test/lib/B20Test.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @notice Base test contract for `IB20` unit tests. /// diff --git a/test/lib/BaseTest.sol b/test/lib/BaseTest.sol index d4e3f06..64ac904 100644 --- a/test/lib/BaseTest.sol +++ b/test/lib/BaseTest.sol @@ -4,13 +4,13 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; import {Vm} from "forge-std/Vm.sol"; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; -import {MockActivationRegistry} from "test/lib/mocks/MockActivationRegistry.sol"; -import {MockPolicyRegistry} from "test/lib/mocks/MockPolicyRegistry.sol"; -import {MockB20Factory} from "test/lib/mocks/MockB20Factory.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {MockActivationRegistry} from "base-std-test/lib/mocks/MockActivationRegistry.sol"; +import {MockPolicyRegistry} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; +import {MockB20Factory} from "base-std-test/lib/mocks/MockB20Factory.sol"; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; /// @notice Common base for every test contract in this suite. /// diff --git a/test/lib/PolicyRegistryTest.sol b/test/lib/PolicyRegistryTest.sol index c9be657..fe0fa04 100644 --- a/test/lib/PolicyRegistryTest.sol +++ b/test/lib/PolicyRegistryTest.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {BaseTest} from "test/lib/BaseTest.sol"; +import {BaseTest} from "base-std-test/lib/BaseTest.sol"; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Base test contract for `IPolicyRegistry` unit tests. /// diff --git a/test/lib/mocks/MockActivationRegistry.sol b/test/lib/mocks/MockActivationRegistry.sol index a1bef15..6524a72 100644 --- a/test/lib/mocks/MockActivationRegistry.sol +++ b/test/lib/mocks/MockActivationRegistry.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; -import {MockActivationRegistryStorage} from "test/lib/mocks/MockActivationRegistryStorage.sol"; +import {MockActivationRegistryStorage} from "base-std-test/lib/mocks/MockActivationRegistryStorage.sol"; /// @title MockActivationRegistry /// @notice Reference implementation of the `IActivationRegistry` precompile. diff --git a/test/lib/mocks/MockB20.sol b/test/lib/mocks/MockB20.sol index 93f0240..e53cb87 100644 --- a/test/lib/mocks/MockB20.sol +++ b/test/lib/mocks/MockB20.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; /// @title MockB20 /// @notice Reference implementation of the `IB20` default-token surface. diff --git a/test/lib/mocks/MockB20Asset.sol b/test/lib/mocks/MockB20Asset.sol index 6970362..a4c7336 100644 --- a/test/lib/mocks/MockB20Asset.sol +++ b/test/lib/mocks/MockB20Asset.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; -import {MockB20AssetStorage, MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20AssetStorage, MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @title MockB20Asset /// @author Coinbase diff --git a/test/lib/mocks/MockB20Factory.sol b/test/lib/mocks/MockB20Factory.sol index 2bfc55b..0c901ee 100644 --- a/test/lib/mocks/MockB20Factory.sol +++ b/test/lib/mocks/MockB20Factory.sol @@ -3,17 +3,21 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; -import {MockB20Stablecoin} from "test/lib/mocks/MockB20Stablecoin.sol"; -import {MockB20Asset} from "test/lib/mocks/MockB20Asset.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage, MockB20AssetStorage, MockB20StablecoinStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20Stablecoin} from "base-std-test/lib/mocks/MockB20Stablecoin.sol"; +import {MockB20Asset} from "base-std-test/lib/mocks/MockB20Asset.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; +import { + MockB20Storage, + MockB20AssetStorage, + MockB20StablecoinStorage +} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @title MockB20Factory /// @notice Reference implementation of the `IB20Factory` precompile diff --git a/test/lib/mocks/MockB20Stablecoin.sol b/test/lib/mocks/MockB20Stablecoin.sol index f90a3dd..0c5731e 100644 --- a/test/lib/mocks/MockB20Stablecoin.sol +++ b/test/lib/mocks/MockB20Stablecoin.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Stablecoin} from "src/interfaces/IB20Stablecoin.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20Stablecoin} from "base-std/interfaces/IB20Stablecoin.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; -import {MockB20StablecoinStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20StablecoinStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @title MockB20Stablecoin /// @notice Reference implementation of the `IB20Stablecoin` variant. diff --git a/test/lib/mocks/MockPolicyRegistry.sol b/test/lib/mocks/MockPolicyRegistry.sol index c20462d..03fbfcc 100644 --- a/test/lib/mocks/MockPolicyRegistry.sol +++ b/test/lib/mocks/MockPolicyRegistry.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Canonical built-in policy ID constants. Declared as a library /// so tests can reference them at compile time via diff --git a/test/regression/B20Removals.t.sol b/test/regression/B20Removals.t.sol index 110efd1..86f7628 100644 --- a/test/regression/B20Removals.t.sol +++ b/test/regression/B20Removals.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; /// @title B20 removal regression suite /// diff --git a/test/regression/B20Renames.t.sol b/test/regression/B20Renames.t.sol index acf4d99..bc43792 100644 --- a/test/regression/B20Renames.t.sol +++ b/test/regression/B20Renames.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; /// @title B20 rename regression suite /// diff --git a/test/unit/ActivationRegistry/activate.t.sol b/test/unit/ActivationRegistry/activate.t.sol index 3ab6052..4a5c195 100644 --- a/test/unit/ActivationRegistry/activate.t.sol +++ b/test/unit/ActivationRegistry/activate.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; -import {MockActivationRegistryStorage} from "test/lib/mocks/MockActivationRegistryStorage.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; +import {MockActivationRegistryStorage} from "base-std-test/lib/mocks/MockActivationRegistryStorage.sol"; contract ActivationRegistryActivateTest is ActivationRegistryTest { /// @notice Verifies activate reverts when called by any non-admin caller diff --git a/test/unit/ActivationRegistry/activate_revertOrder.t.sol b/test/unit/ActivationRegistry/activate_revertOrder.t.sol index 0edd121..b860694 100644 --- a/test/unit/ActivationRegistry/activate_revertOrder.t.sol +++ b/test/unit/ActivationRegistry/activate_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; contract ActivationRegistryActivateRevertOrderTest is ActivationRegistryTest { /// @notice Verifies Unauthorized fires before AlreadyActivated when caller is not admin diff --git a/test/unit/ActivationRegistry/admin.t.sol b/test/unit/ActivationRegistry/admin.t.sol index 66c2be4..4b1b31f 100644 --- a/test/unit/ActivationRegistry/admin.t.sol +++ b/test/unit/ActivationRegistry/admin.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; contract ActivationRegistryAdminTest is ActivationRegistryTest { /// @notice Verifies admin returns the configured activation admin address diff --git a/test/unit/ActivationRegistry/deactivate.t.sol b/test/unit/ActivationRegistry/deactivate.t.sol index 3c5cf24..79e1160 100644 --- a/test/unit/ActivationRegistry/deactivate.t.sol +++ b/test/unit/ActivationRegistry/deactivate.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; -import {MockActivationRegistryStorage} from "test/lib/mocks/MockActivationRegistryStorage.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; +import {MockActivationRegistryStorage} from "base-std-test/lib/mocks/MockActivationRegistryStorage.sol"; contract ActivationRegistryDeactivateTest is ActivationRegistryTest { /// @notice Verifies deactivate reverts when called by any non-admin caller diff --git a/test/unit/ActivationRegistry/deactivate_revertOrder.t.sol b/test/unit/ActivationRegistry/deactivate_revertOrder.t.sol index 95e17b1..33d0c02 100644 --- a/test/unit/ActivationRegistry/deactivate_revertOrder.t.sol +++ b/test/unit/ActivationRegistry/deactivate_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; contract ActivationRegistryDeactivateRevertOrderTest is ActivationRegistryTest { /// @notice Verifies Unauthorized fires before FeatureNotActivated when caller is not admin diff --git a/test/unit/ActivationRegistry/featureList.t.sol b/test/unit/ActivationRegistry/featureList.t.sol index 954c795..444cc95 100644 --- a/test/unit/ActivationRegistry/featureList.t.sol +++ b/test/unit/ActivationRegistry/featureList.t.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; /// @notice Pins each feature id constant in `ActivationRegistryFeatureList` to /// its canonical `keccak256("base.")` preimage. diff --git a/test/unit/ActivationRegistry/isActivated.t.sol b/test/unit/ActivationRegistry/isActivated.t.sol index 0cbc58d..eb81051 100644 --- a/test/unit/ActivationRegistry/isActivated.t.sol +++ b/test/unit/ActivationRegistry/isActivated.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; contract ActivationRegistryIsActivatedTest is ActivationRegistryTest { /// @notice Verifies isActivated returns false for any feature id that has never been activated diff --git a/test/unit/B20/erc20/allowance.t.sol b/test/unit/B20/erc20/allowance.t.sol index 47a6c19..1112bf4 100644 --- a/test/unit/B20/erc20/allowance.t.sol +++ b/test/unit/B20/erc20/allowance.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; contract B20AllowanceTest is B20Test { /// @notice Verifies allowance returns zero for any unconfigured (owner, spender) pair diff --git a/test/unit/B20/erc20/approve.t.sol b/test/unit/B20/erc20/approve.t.sol index dac1455..f16adb7 100644 --- a/test/unit/B20/erc20/approve.t.sol +++ b/test/unit/B20/erc20/approve.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20ApproveTest is B20Test { /// @notice Verifies approve reverts for the zero spender address diff --git a/test/unit/B20/erc20/approve_revertOrder.t.sol b/test/unit/B20/erc20/approve_revertOrder.t.sol index 869363f..9e59e23 100644 --- a/test/unit/B20/erc20/approve_revertOrder.t.sol +++ b/test/unit/B20/erc20/approve_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `approve`. /// diff --git a/test/unit/B20/erc20/balanceOf.t.sol b/test/unit/B20/erc20/balanceOf.t.sol index 2e096d3..6fbdfc2 100644 --- a/test/unit/B20/erc20/balanceOf.t.sol +++ b/test/unit/B20/erc20/balanceOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; contract B20BalanceOfTest is B20Test { /// @notice Verifies balanceOf returns zero for any account that has never received tokens diff --git a/test/unit/B20/erc20/decimals.t.sol b/test/unit/B20/erc20/decimals.t.sol index 5851b28..a4d9af9 100644 --- a/test/unit/B20/erc20/decimals.t.sol +++ b/test/unit/B20/erc20/decimals.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; contract B20DecimalsTest is B20Test { /// @notice Verifies asset-token decimals are fixed at 6 diff --git a/test/unit/B20/erc20/name.t.sol b/test/unit/B20/erc20/name.t.sol index 7492f0a..32fc8ee 100644 --- a/test/unit/B20/erc20/name.t.sol +++ b/test/unit/B20/erc20/name.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20NameTest is B20Test { /// @notice Verifies name returns the value passed to the factory at creation diff --git a/test/unit/B20/erc20/symbol.t.sol b/test/unit/B20/erc20/symbol.t.sol index 123023b..af41c54 100644 --- a/test/unit/B20/erc20/symbol.t.sol +++ b/test/unit/B20/erc20/symbol.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20SymbolTest is B20Test { /// @notice Verifies symbol returns the value passed to the factory at creation diff --git a/test/unit/B20/erc20/totalSupply.t.sol b/test/unit/B20/erc20/totalSupply.t.sol index dccb0f3..31ace9b 100644 --- a/test/unit/B20/erc20/totalSupply.t.sol +++ b/test/unit/B20/erc20/totalSupply.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20TotalSupplyTest is B20Test { /// @notice Verifies totalSupply returns the cumulative minted-minus-burned amount diff --git a/test/unit/B20/erc20/transfer.t.sol b/test/unit/B20/erc20/transfer.t.sol index 29a2820..ed81854 100644 --- a/test/unit/B20/erc20/transfer.t.sol +++ b/test/unit/B20/erc20/transfer.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20TransferTest is B20Test { /// @notice Verifies transfer reverts when the TRANSFER feature is paused diff --git a/test/unit/B20/erc20/transferFrom.t.sol b/test/unit/B20/erc20/transferFrom.t.sol index 05a4174..bf431ec 100644 --- a/test/unit/B20/erc20/transferFrom.t.sol +++ b/test/unit/B20/erc20/transferFrom.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20TransferFromTest is B20Test { /// @notice Verifies transferFrom reverts when the TRANSFER feature is paused diff --git a/test/unit/B20/erc20/transferFromWithMemo_revertOrder.t.sol b/test/unit/B20/erc20/transferFromWithMemo_revertOrder.t.sol index 8cdd6b4..faed358 100644 --- a/test/unit/B20/erc20/transferFromWithMemo_revertOrder.t.sol +++ b/test/unit/B20/erc20/transferFromWithMemo_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Sequential check-order test for `transferFromWithMemo`. /// diff --git a/test/unit/B20/erc20/transferFrom_revertOrder.t.sol b/test/unit/B20/erc20/transferFrom_revertOrder.t.sol index 63cb023..ba84c27 100644 --- a/test/unit/B20/erc20/transferFrom_revertOrder.t.sol +++ b/test/unit/B20/erc20/transferFrom_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Differential check-order tests for `transferFrom`. /// diff --git a/test/unit/B20/erc20/transferWithMemo_revertOrder.t.sol b/test/unit/B20/erc20/transferWithMemo_revertOrder.t.sol index 827666c..2b331e1 100644 --- a/test/unit/B20/erc20/transferWithMemo_revertOrder.t.sol +++ b/test/unit/B20/erc20/transferWithMemo_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Sequential check-order test for `transferWithMemo`. /// diff --git a/test/unit/B20/erc20/transfer_revertOrder.t.sol b/test/unit/B20/erc20/transfer_revertOrder.t.sol index af36a77..839e8ee 100644 --- a/test/unit/B20/erc20/transfer_revertOrder.t.sol +++ b/test/unit/B20/erc20/transfer_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Differential check-order tests for `transfer`. /// diff --git a/test/unit/B20/memo/burnWithMemo.t.sol b/test/unit/B20/memo/burnWithMemo.t.sol index 22d2323..ee47aa0 100644 --- a/test/unit/B20/memo/burnWithMemo.t.sol +++ b/test/unit/B20/memo/burnWithMemo.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20BurnWithMemoTest is B20Test { /// @notice Verifies burnWithMemo inherits all burn guards diff --git a/test/unit/B20/memo/mintWithMemo.t.sol b/test/unit/B20/memo/mintWithMemo.t.sol index 9630e03..bf73cda 100644 --- a/test/unit/B20/memo/mintWithMemo.t.sol +++ b/test/unit/B20/memo/mintWithMemo.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20MintWithMemoTest is B20Test { /// @notice Verifies mintWithMemo inherits all mint guards diff --git a/test/unit/B20/memo/transferFromWithMemo.t.sol b/test/unit/B20/memo/transferFromWithMemo.t.sol index 65f2f0e..af6489f 100644 --- a/test/unit/B20/memo/transferFromWithMemo.t.sol +++ b/test/unit/B20/memo/transferFromWithMemo.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20TransferFromWithMemoTest is B20Test { /// @notice Verifies transferFromWithMemo inherits all transferFrom guards diff --git a/test/unit/B20/memo/transferWithMemo.t.sol b/test/unit/B20/memo/transferWithMemo.t.sol index d16fb76..92eb28a 100644 --- a/test/unit/B20/memo/transferWithMemo.t.sol +++ b/test/unit/B20/memo/transferWithMemo.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20TransferWithMemoTest is B20Test { /// @notice Verifies transferWithMemo applies the same pause / policy / balance checks as transfer diff --git a/test/unit/B20/metadata/contractURI.t.sol b/test/unit/B20/metadata/contractURI.t.sol index de1c4bf..d17012c 100644 --- a/test/unit/B20/metadata/contractURI.t.sol +++ b/test/unit/B20/metadata/contractURI.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20ContractURITest is B20Test { /// @notice Verifies contractURI returns the value set at token creation diff --git a/test/unit/B20/metadata/updateContractURI.t.sol b/test/unit/B20/metadata/updateContractURI.t.sol index 4244abf..d15e01e 100644 --- a/test/unit/B20/metadata/updateContractURI.t.sol +++ b/test/unit/B20/metadata/updateContractURI.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20UpdateContractURITest is B20Test { /// @notice Verifies updateContractURI reverts when caller lacks METADATA_ROLE diff --git a/test/unit/B20/metadata/updateContractURI_revertOrder.t.sol b/test/unit/B20/metadata/updateContractURI_revertOrder.t.sol index 096333d..38f345d 100644 --- a/test/unit/B20/metadata/updateContractURI_revertOrder.t.sol +++ b/test/unit/B20/metadata/updateContractURI_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `updateContractURI`. /// diff --git a/test/unit/B20/metadata/updateName.t.sol b/test/unit/B20/metadata/updateName.t.sol index b28543d..40ff546 100644 --- a/test/unit/B20/metadata/updateName.t.sol +++ b/test/unit/B20/metadata/updateName.t.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20UpdateNameTest is B20Test { /// @notice Verifies updateName reverts when caller lacks METADATA_ROLE diff --git a/test/unit/B20/metadata/updateName_revertOrder.t.sol b/test/unit/B20/metadata/updateName_revertOrder.t.sol index 82fc92f..2fdc060 100644 --- a/test/unit/B20/metadata/updateName_revertOrder.t.sol +++ b/test/unit/B20/metadata/updateName_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `updateName`. /// diff --git a/test/unit/B20/metadata/updateSymbol.t.sol b/test/unit/B20/metadata/updateSymbol.t.sol index d904c84..22d3f39 100644 --- a/test/unit/B20/metadata/updateSymbol.t.sol +++ b/test/unit/B20/metadata/updateSymbol.t.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20UpdateSymbolTest is B20Test { /// @notice Verifies updateSymbol reverts when caller lacks METADATA_ROLE diff --git a/test/unit/B20/metadata/updateSymbol_revertOrder.t.sol b/test/unit/B20/metadata/updateSymbol_revertOrder.t.sol index 96fefc9..41280e3 100644 --- a/test/unit/B20/metadata/updateSymbol_revertOrder.t.sol +++ b/test/unit/B20/metadata/updateSymbol_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `updateSymbol`. /// diff --git a/test/unit/B20/pause/isPaused.t.sol b/test/unit/B20/pause/isPaused.t.sol index f3c0c13..466a82e 100644 --- a/test/unit/B20/pause/isPaused.t.sol +++ b/test/unit/B20/pause/isPaused.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20IsPausedTest is B20Test { /// @notice Verifies isPaused returns false for every feature on a freshly-created token diff --git a/test/unit/B20/pause/pause.t.sol b/test/unit/B20/pause/pause.t.sol index 7dd4cc5..1cd9845 100644 --- a/test/unit/B20/pause/pause.t.sol +++ b/test/unit/B20/pause/pause.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20PauseTest is B20Test { /// @notice Verifies pause reverts when caller lacks PAUSE_ROLE diff --git a/test/unit/B20/pause/pause_revertOrder.t.sol b/test/unit/B20/pause/pause_revertOrder.t.sol index fc8673e..a0fc4a8 100644 --- a/test/unit/B20/pause/pause_revertOrder.t.sol +++ b/test/unit/B20/pause/pause_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `pause`. /// diff --git a/test/unit/B20/pause/pausedFeatures.t.sol b/test/unit/B20/pause/pausedFeatures.t.sol index 804385a..859ce47 100644 --- a/test/unit/B20/pause/pausedFeatures.t.sol +++ b/test/unit/B20/pause/pausedFeatures.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20PausedFeaturesTest is B20Test { /// @notice Verifies pausedFeatures returns an empty array on a freshly-created token diff --git a/test/unit/B20/pause/unpause.t.sol b/test/unit/B20/pause/unpause.t.sol index 9b3a0b5..b99a63b 100644 --- a/test/unit/B20/pause/unpause.t.sol +++ b/test/unit/B20/pause/unpause.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20UnpauseTest is B20Test { /// @notice Verifies unpause reverts when caller lacks UNPAUSE_ROLE diff --git a/test/unit/B20/pause/unpause_revertOrder.t.sol b/test/unit/B20/pause/unpause_revertOrder.t.sol index cff57ce..972f279 100644 --- a/test/unit/B20/pause/unpause_revertOrder.t.sol +++ b/test/unit/B20/pause/unpause_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `unpause`. /// diff --git a/test/unit/B20/permit/DOMAIN_SEPARATOR.t.sol b/test/unit/B20/permit/DOMAIN_SEPARATOR.t.sol index aa7a7cc..8ef1f07 100644 --- a/test/unit/B20/permit/DOMAIN_SEPARATOR.t.sol +++ b/test/unit/B20/permit/DOMAIN_SEPARATOR.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20DomainSeparatorTest is B20Test { /// @dev Canonical EIP-2612 domain type hash, recomputed in-test from the diff --git a/test/unit/B20/permit/eip712Domain.t.sol b/test/unit/B20/permit/eip712Domain.t.sol index 8d88751..9f105c1 100644 --- a/test/unit/B20/permit/eip712Domain.t.sol +++ b/test/unit/B20/permit/eip712Domain.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20Eip712DomainTest is B20Test { /// @notice Verifies eip712Domain returns the documented (name, version, chainId, verifyingContract) shape diff --git a/test/unit/B20/permit/nonces.t.sol b/test/unit/B20/permit/nonces.t.sol index b12186c..a82a1ff 100644 --- a/test/unit/B20/permit/nonces.t.sol +++ b/test/unit/B20/permit/nonces.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; contract B20NoncesTest is B20Test { /// @notice Verifies nonces returns zero for any account that has never permitted diff --git a/test/unit/B20/permit/permit.t.sol b/test/unit/B20/permit/permit.t.sol index 8250cec..5e70284 100644 --- a/test/unit/B20/permit/permit.t.sol +++ b/test/unit/B20/permit/permit.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20PermitTest is B20Test { /// @notice Verifies permit reverts when the deadline has passed diff --git a/test/unit/B20/permit/permit_revertOrder.t.sol b/test/unit/B20/permit/permit_revertOrder.t.sol index e96397b..de6c422 100644 --- a/test/unit/B20/permit/permit_revertOrder.t.sol +++ b/test/unit/B20/permit/permit_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `permit`. /// diff --git a/test/unit/B20/policy/policyId.t.sol b/test/unit/B20/policy/policyId.t.sol index f8a1b7c..c72036a 100644 --- a/test/unit/B20/policy/policyId.t.sol +++ b/test/unit/B20/policy/policyId.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20PolicyIdTest is B20Test { /// @notice Verifies policyId returns 0 (always-allow built-in) for any supported slot before configuration diff --git a/test/unit/B20/policy/policyTypeConstants.t.sol b/test/unit/B20/policy/policyTypeConstants.t.sol index 26800a6..7487b85 100644 --- a/test/unit/B20/policy/policyTypeConstants.t.sol +++ b/test/unit/B20/policy/policyTypeConstants.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @notice Folds the four trivial policy-type constant readers /// into one file since each is a one-stub assertion against a diff --git a/test/unit/B20/policy/updatePolicy.t.sol b/test/unit/B20/policy/updatePolicy.t.sol index 2c0d18d..3a266ca 100644 --- a/test/unit/B20/policy/updatePolicy.t.sol +++ b/test/unit/B20/policy/updatePolicy.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20UpdatePolicyTest is B20Test { /// @notice Reads the policy id stored in the slot lane that diff --git a/test/unit/B20/policy/updatePolicy_revertOrder.t.sol b/test/unit/B20/policy/updatePolicy_revertOrder.t.sol index 583141e..45006fe 100644 --- a/test/unit/B20/policy/updatePolicy_revertOrder.t.sol +++ b/test/unit/B20/policy/updatePolicy_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Differential check-order tests for `updatePolicy`. /// diff --git a/test/unit/B20/roles/getRoleAdmin.t.sol b/test/unit/B20/roles/getRoleAdmin.t.sol index 5646ecd..e430f85 100644 --- a/test/unit/B20/roles/getRoleAdmin.t.sol +++ b/test/unit/B20/roles/getRoleAdmin.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20GetRoleAdminTest is B20Test { /// @notice Verifies getRoleAdmin returns DEFAULT_ADMIN_ROLE for any role that hasn't been customized diff --git a/test/unit/B20/roles/grantRole.t.sol b/test/unit/B20/roles/grantRole.t.sol index acdfe17..236f0c4 100644 --- a/test/unit/B20/roles/grantRole.t.sol +++ b/test/unit/B20/roles/grantRole.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20GrantRoleTest is B20Test { /// @notice Verifies grantRole reverts when caller does not hold the role's admin role diff --git a/test/unit/B20/roles/grantRole_revertOrder.t.sol b/test/unit/B20/roles/grantRole_revertOrder.t.sol index d04e0d7..595755e 100644 --- a/test/unit/B20/roles/grantRole_revertOrder.t.sol +++ b/test/unit/B20/roles/grantRole_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `grantRole`. /// diff --git a/test/unit/B20/roles/hasRole.t.sol b/test/unit/B20/roles/hasRole.t.sol index 9250c7f..8c00749 100644 --- a/test/unit/B20/roles/hasRole.t.sol +++ b/test/unit/B20/roles/hasRole.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; contract B20HasRoleTest is B20Test { /// @notice Verifies hasRole returns false for any (role, account) pair that has never been granted diff --git a/test/unit/B20/roles/renounceLastAdmin.t.sol b/test/unit/B20/roles/renounceLastAdmin.t.sol index 1c1698a..58725e0 100644 --- a/test/unit/B20/roles/renounceLastAdmin.t.sol +++ b/test/unit/B20/roles/renounceLastAdmin.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20RenounceLastAdminTest is B20Test { /// @notice Verifies renounceLastAdmin reverts when caller does not hold DEFAULT_ADMIN_ROLE diff --git a/test/unit/B20/roles/renounceLastAdmin_revertOrder.t.sol b/test/unit/B20/roles/renounceLastAdmin_revertOrder.t.sol index a8210fd..30edf1f 100644 --- a/test/unit/B20/roles/renounceLastAdmin_revertOrder.t.sol +++ b/test/unit/B20/roles/renounceLastAdmin_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `renounceLastAdmin`. /// diff --git a/test/unit/B20/roles/renounceRole.t.sol b/test/unit/B20/roles/renounceRole.t.sol index 8188559..a26e2b7 100644 --- a/test/unit/B20/roles/renounceRole.t.sol +++ b/test/unit/B20/roles/renounceRole.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20RenounceRoleTest is B20Test { /// @notice Verifies renounceRole reverts when callerConfirmation does not equal msg.sender diff --git a/test/unit/B20/roles/renounceRole_revertOrder.t.sol b/test/unit/B20/roles/renounceRole_revertOrder.t.sol index 5aabc0a..e3e7f2e 100644 --- a/test/unit/B20/roles/renounceRole_revertOrder.t.sol +++ b/test/unit/B20/roles/renounceRole_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `renounceRole`. /// diff --git a/test/unit/B20/roles/revokeRole.t.sol b/test/unit/B20/roles/revokeRole.t.sol index 98a7875..96fc91e 100644 --- a/test/unit/B20/roles/revokeRole.t.sol +++ b/test/unit/B20/roles/revokeRole.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20RevokeRoleTest is B20Test { /// @notice Verifies revokeRole reverts when caller does not hold the role's admin role diff --git a/test/unit/B20/roles/revokeRole_revertOrder.t.sol b/test/unit/B20/roles/revokeRole_revertOrder.t.sol index 4fbe6bb..68103bd 100644 --- a/test/unit/B20/roles/revokeRole_revertOrder.t.sol +++ b/test/unit/B20/roles/revokeRole_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `revokeRole`. /// diff --git a/test/unit/B20/roles/roleConstants.t.sol b/test/unit/B20/roles/roleConstants.t.sol index 31a4cca..abeacf5 100644 --- a/test/unit/B20/roles/roleConstants.t.sol +++ b/test/unit/B20/roles/roleConstants.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @notice Folds the seven trivial role-constant readers into one /// file since each is a one-stub assertion against a fixed keccak diff --git a/test/unit/B20/roles/setRoleAdmin.t.sol b/test/unit/B20/roles/setRoleAdmin.t.sol index 0bc4525..716beda 100644 --- a/test/unit/B20/roles/setRoleAdmin.t.sol +++ b/test/unit/B20/roles/setRoleAdmin.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20SetRoleAdminTest is B20Test { /// @notice Verifies setRoleAdmin reverts when caller does not hold the role's current admin role diff --git a/test/unit/B20/roles/setRoleAdmin_revertOrder.t.sol b/test/unit/B20/roles/setRoleAdmin_revertOrder.t.sol index 93611da..58ffe20 100644 --- a/test/unit/B20/roles/setRoleAdmin_revertOrder.t.sol +++ b/test/unit/B20/roles/setRoleAdmin_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `setRoleAdmin`. /// diff --git a/test/unit/B20/supply/burn.t.sol b/test/unit/B20/supply/burn.t.sol index 146d809..1ade631 100644 --- a/test/unit/B20/supply/burn.t.sol +++ b/test/unit/B20/supply/burn.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20BurnTest is B20Test { /// @notice Verifies burn reverts when caller lacks BURN_ROLE diff --git a/test/unit/B20/supply/burnBlocked.t.sol b/test/unit/B20/supply/burnBlocked.t.sol index 52cdb9e..2ed8282 100644 --- a/test/unit/B20/supply/burnBlocked.t.sol +++ b/test/unit/B20/supply/burnBlocked.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20BurnBlockedTest is B20Test { /// @notice Verifies burnBlocked reverts when caller lacks BURN_BLOCKED_ROLE diff --git a/test/unit/B20/supply/burnBlocked_revertOrder.t.sol b/test/unit/B20/supply/burnBlocked_revertOrder.t.sol index 94f572c..bafaa64 100644 --- a/test/unit/B20/supply/burnBlocked_revertOrder.t.sol +++ b/test/unit/B20/supply/burnBlocked_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Differential check-order tests for `burnBlocked`. /// diff --git a/test/unit/B20/supply/burnWithMemo_revertOrder.t.sol b/test/unit/B20/supply/burnWithMemo_revertOrder.t.sol index d4a3db5..a09aa2c 100644 --- a/test/unit/B20/supply/burnWithMemo_revertOrder.t.sol +++ b/test/unit/B20/supply/burnWithMemo_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Sequential check-order test for `burnWithMemo` (self-burn with memo). /// diff --git a/test/unit/B20/supply/burn_revertOrder.t.sol b/test/unit/B20/supply/burn_revertOrder.t.sol index ee5e786..24247b0 100644 --- a/test/unit/B20/supply/burn_revertOrder.t.sol +++ b/test/unit/B20/supply/burn_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `burn` (self-burn). /// diff --git a/test/unit/B20/supply/mint.t.sol b/test/unit/B20/supply/mint.t.sol index e7b1b03..8d6e361 100644 --- a/test/unit/B20/supply/mint.t.sol +++ b/test/unit/B20/supply/mint.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20MintTest is B20Test { /// @notice Verifies mint reverts when caller lacks MINT_ROLE diff --git a/test/unit/B20/supply/mintWithMemo_revertOrder.t.sol b/test/unit/B20/supply/mintWithMemo_revertOrder.t.sol index 4e0fdac..529aa00 100644 --- a/test/unit/B20/supply/mintWithMemo_revertOrder.t.sol +++ b/test/unit/B20/supply/mintWithMemo_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Sequential check-order test for `mintWithMemo`. /// diff --git a/test/unit/B20/supply/mint_revertOrder.t.sol b/test/unit/B20/supply/mint_revertOrder.t.sol index fa75e33..b7af6a2 100644 --- a/test/unit/B20/supply/mint_revertOrder.t.sol +++ b/test/unit/B20/supply/mint_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @title Differential check-order tests for `mint`. /// diff --git a/test/unit/B20/supply/supplyCap.t.sol b/test/unit/B20/supply/supplyCap.t.sol index c6debec..e539b5f 100644 --- a/test/unit/B20/supply/supplyCap.t.sol +++ b/test/unit/B20/supply/supplyCap.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Test} from "test/lib/B20Test.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; contract B20SupplyCapTest is B20Test { /// @notice Verifies supplyCap returns the value set at token creation diff --git a/test/unit/B20/supply/updateSupplyCap.t.sol b/test/unit/B20/supply/updateSupplyCap.t.sol index 5139cfe..9919872 100644 --- a/test/unit/B20/supply/updateSupplyCap.t.sol +++ b/test/unit/B20/supply/updateSupplyCap.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20UpdateSupplyCapTest is B20Test { /// @notice Verifies updateSupplyCap reverts when caller lacks DEFAULT_ADMIN_ROLE diff --git a/test/unit/B20/supply/updateSupplyCap_revertOrder.t.sol b/test/unit/B20/supply/updateSupplyCap_revertOrder.t.sol index 4e637c1..c4cd839 100644 --- a/test/unit/B20/supply/updateSupplyCap_revertOrder.t.sol +++ b/test/unit/B20/supply/updateSupplyCap_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `updateSupplyCap`. /// diff --git a/test/unit/B20Asset/announcement/announce.t.sol b/test/unit/B20Asset/announcement/announce.t.sol index a264563..b48d422 100644 --- a/test/unit/B20Asset/announcement/announce.t.sol +++ b/test/unit/B20Asset/announcement/announce.t.sol @@ -3,12 +3,12 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; contract B20AssetAnnounceTest is B20AssetTest { /// @notice Verifies announce reverts when caller lacks OPERATOR_ROLE diff --git a/test/unit/B20Asset/announcement/announce_revertOrder.t.sol b/test/unit/B20Asset/announcement/announce_revertOrder.t.sol index a067112..5d7d088 100644 --- a/test/unit/B20Asset/announcement/announce_revertOrder.t.sol +++ b/test/unit/B20Asset/announcement/announce_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; /// @title Differential check-order tests for `announce`. /// diff --git a/test/unit/B20Asset/announcement/isAnnouncementIdUsed.t.sol b/test/unit/B20Asset/announcement/isAnnouncementIdUsed.t.sol index 6a4392b..f7f21b6 100644 --- a/test/unit/B20Asset/announcement/isAnnouncementIdUsed.t.sol +++ b/test/unit/B20Asset/announcement/isAnnouncementIdUsed.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20AssetStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20AssetIsAnnouncementIdUsedTest is B20AssetTest { /// @notice Verifies isAnnouncementIdUsed returns false for an unseen id diff --git a/test/unit/B20Asset/batch/batchMint.t.sol b/test/unit/B20Asset/batch/batchMint.t.sol index e71a91e..0177307 100644 --- a/test/unit/B20Asset/batch/batchMint.t.sol +++ b/test/unit/B20Asset/batch/batchMint.t.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20AssetBatchMintTest is B20AssetTest { /// @notice Verifies batchMint reverts when recipients.length != amounts.length diff --git a/test/unit/B20Asset/batch/batchMint_revertOrder.t.sol b/test/unit/B20Asset/batch/batchMint_revertOrder.t.sol index 485d788..295e2ed 100644 --- a/test/unit/B20Asset/batch/batchMint_revertOrder.t.sol +++ b/test/unit/B20Asset/batch/batchMint_revertOrder.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; -import {B20Constants} from "test/lib/mocks/MockB20.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; +import {B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; /// @title Differential check-order tests for `batchMint` (asset variant). /// diff --git a/test/unit/B20Asset/batch/batchMint_rollback.t.sol b/test/unit/B20Asset/batch/batchMint_rollback.t.sol index bf8996d..b7bc2c8 100644 --- a/test/unit/B20Asset/batch/batchMint_rollback.t.sol +++ b/test/unit/B20Asset/batch/batchMint_rollback.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; /// @title B20AssetBatchMintRollbackTest /// @notice Verifies a revert mid-batchMint leaves no orphan token state. diff --git a/test/unit/B20Asset/constants/precisionConstants.t.sol b/test/unit/B20Asset/constants/precisionConstants.t.sol index 0653a78..5bd6f84 100644 --- a/test/unit/B20Asset/constants/precisionConstants.t.sol +++ b/test/unit/B20Asset/constants/precisionConstants.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetPrecisionConstantsTest is B20AssetTest { /// @notice Verifies WAD_PRECISION equals 1e18 diff --git a/test/unit/B20Asset/constants/roleConstants.t.sol b/test/unit/B20Asset/constants/roleConstants.t.sol index 771cced..5bf2768 100644 --- a/test/unit/B20Asset/constants/roleConstants.t.sol +++ b/test/unit/B20Asset/constants/roleConstants.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetRoleConstantsTest is B20AssetTest { /// @notice Verifies OPERATOR_ROLE equals keccak256("OPERATOR_ROLE") diff --git a/test/unit/B20Asset/extraMetadata/extraMetadata.t.sol b/test/unit/B20Asset/extraMetadata/extraMetadata.t.sol index cf151ad..9886ca5 100644 --- a/test/unit/B20Asset/extraMetadata/extraMetadata.t.sol +++ b/test/unit/B20Asset/extraMetadata/extraMetadata.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetExtraMetadataTest is B20AssetTest { /// @notice Verifies extraMetadata returns the empty string for an unset entry diff --git a/test/unit/B20Asset/extraMetadata/updateExtraMetadata.t.sol b/test/unit/B20Asset/extraMetadata/updateExtraMetadata.t.sol index 3faa05f..1f76069 100644 --- a/test/unit/B20Asset/extraMetadata/updateExtraMetadata.t.sol +++ b/test/unit/B20Asset/extraMetadata/updateExtraMetadata.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; contract B20AssetUpdateExtraMetadataTest is B20AssetTest { /// @notice Verifies updateExtraMetadata reverts when caller lacks METADATA_ROLE diff --git a/test/unit/B20Asset/extraMetadata/updateExtraMetadata_revertOrder.t.sol b/test/unit/B20Asset/extraMetadata/updateExtraMetadata_revertOrder.t.sol index 14bacab..0078f48 100644 --- a/test/unit/B20Asset/extraMetadata/updateExtraMetadata_revertOrder.t.sol +++ b/test/unit/B20Asset/extraMetadata/updateExtraMetadata_revertOrder.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; /// @title Sequential revert-order test for `updateExtraMetadata`. /// diff --git a/test/unit/B20Asset/multiplier/multiplier.t.sol b/test/unit/B20Asset/multiplier/multiplier.t.sol index 0d7cfd4..937a979 100644 --- a/test/unit/B20Asset/multiplier/multiplier.t.sol +++ b/test/unit/B20Asset/multiplier/multiplier.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20AssetStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20AssetMultiplierTest is B20AssetTest { /// @notice Verifies the default (unwritten) multiplier resolves to WAD_PRECISION diff --git a/test/unit/B20Asset/multiplier/scaledBalanceOf.t.sol b/test/unit/B20Asset/multiplier/scaledBalanceOf.t.sol index d132e60..0dc3dfc 100644 --- a/test/unit/B20Asset/multiplier/scaledBalanceOf.t.sol +++ b/test/unit/B20Asset/multiplier/scaledBalanceOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetScaledBalanceOfTest is B20AssetTest { /// @notice Verifies scaledBalanceOf is zero for an account with no balance diff --git a/test/unit/B20Asset/multiplier/toRawBalance.t.sol b/test/unit/B20Asset/multiplier/toRawBalance.t.sol index e171768..0afaff3 100644 --- a/test/unit/B20Asset/multiplier/toRawBalance.t.sol +++ b/test/unit/B20Asset/multiplier/toRawBalance.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetToRawBalanceTest is B20AssetTest { /// @notice Verifies toRawBalance is the identity on a fresh token (WAD multiplier) diff --git a/test/unit/B20Asset/multiplier/toScaledBalance.t.sol b/test/unit/B20Asset/multiplier/toScaledBalance.t.sol index 85df73c..1b8dac4 100644 --- a/test/unit/B20Asset/multiplier/toScaledBalance.t.sol +++ b/test/unit/B20Asset/multiplier/toScaledBalance.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; contract B20AssetToScaledBalanceTest is B20AssetTest { /// @notice Verifies toScaledBalance is the identity on a fresh token (WAD multiplier) diff --git a/test/unit/B20Asset/multiplier/updateMultiplier.t.sol b/test/unit/B20Asset/multiplier/updateMultiplier.t.sol index 404cd9a..1b3df9b 100644 --- a/test/unit/B20Asset/multiplier/updateMultiplier.t.sol +++ b/test/unit/B20Asset/multiplier/updateMultiplier.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {MockB20AssetStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; contract B20AssetUpdateMultiplierTest is B20AssetTest { /// @notice Verifies updateMultiplier reverts when caller lacks OPERATOR_ROLE diff --git a/test/unit/B20Asset/multiplier/updateMultiplier_revertOrder.t.sol b/test/unit/B20Asset/multiplier/updateMultiplier_revertOrder.t.sol index 7138754..54abbfb 100644 --- a/test/unit/B20Asset/multiplier/updateMultiplier_revertOrder.t.sol +++ b/test/unit/B20Asset/multiplier/updateMultiplier_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; /// @title Sequential revert-order test for `updateMultiplier`. /// diff --git a/test/unit/B20Asset/policy/policyId.t.sol b/test/unit/B20Asset/policy/policyId.t.sol index 9e82f73..e1249c8 100644 --- a/test/unit/B20Asset/policy/policyId.t.sol +++ b/test/unit/B20Asset/policy/policyId.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; contract B20AssetPolicyIdTest is B20AssetTest { /// @notice Verifies policyId still resolves the four base policy types on the asset variant. diff --git a/test/unit/B20Asset/policy/updatePolicy.t.sol b/test/unit/B20Asset/policy/updatePolicy.t.sol index a313128..77d525d 100644 --- a/test/unit/B20Asset/policy/updatePolicy.t.sol +++ b/test/unit/B20Asset/policy/updatePolicy.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract B20AssetUpdatePolicyTest is B20AssetTest { /// @notice Verifies updatePolicy still routes base policy types through the inherited write path on the asset variant. diff --git a/test/unit/B20Factory/createB20_activation.t.sol b/test/unit/B20Factory/createB20_activation.t.sol index 8ab990c..53b5a9b 100644 --- a/test/unit/B20Factory/createB20_activation.t.sol +++ b/test/unit/B20Factory/createB20_activation.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IActivationRegistry} from "src/interfaces/IActivationRegistry.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IActivationRegistry} from "base-std/interfaces/IActivationRegistry.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; -import {ActivationRegistryFeatureList} from "test/lib/mocks/ActivationRegistryFeatureList.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {ActivationRegistryFeatureList} from "base-std-test/lib/mocks/ActivationRegistryFeatureList.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; /// @notice Pins the activation gating on `createB20`. /// diff --git a/test/unit/B20Factory/createB20_asset_decimals.t.sol b/test/unit/B20Factory/createB20_asset_decimals.t.sol index 773ae06..2a10ea4 100644 --- a/test/unit/B20Factory/createB20_asset_decimals.t.sol +++ b/test/unit/B20Factory/createB20_asset_decimals.t.sol @@ -3,13 +3,13 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {MockB20} from "test/lib/mocks/MockB20.sol"; -import {MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {MockB20} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20AssetStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; /// @notice Coverage for the asset variant's configurable `decimals` field. /// diff --git a/test/unit/B20Factory/createB20_revertOrder.t.sol b/test/unit/B20Factory/createB20_revertOrder.t.sol index 0adeab8..99e82c0 100644 --- a/test/unit/B20Factory/createB20_revertOrder.t.sol +++ b/test/unit/B20Factory/createB20_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; /// @title Differential check-order tests for `createB20`. /// diff --git a/test/unit/B20Factory/createToken.t.sol b/test/unit/B20Factory/createToken.t.sol index 280d1cf..33bf92b 100644 --- a/test/unit/B20Factory/createToken.t.sol +++ b/test/unit/B20Factory/createToken.t.sol @@ -3,16 +3,16 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {IB20} from "src/interfaces/IB20.sol"; -import {IB20Stablecoin} from "src/interfaces/IB20Stablecoin.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; - -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; -import {MockB20Storage, MockB20StablecoinStorage} from "test/lib/mocks/MockB20Storage.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IB20Stablecoin} from "base-std/interfaces/IB20Stablecoin.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; + +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; +import {MockB20Storage, MockB20StablecoinStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; contract B20FactoryCreateB20Test is B20FactoryTest { // Role constants are accessed as `MINT_ROLE` etc. — these are diff --git a/test/unit/B20Factory/getTokenAddress.t.sol b/test/unit/B20Factory/getTokenAddress.t.sol index 759feb0..78ebf87 100644 --- a/test/unit/B20Factory/getTokenAddress.t.sol +++ b/test/unit/B20Factory/getTokenAddress.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; contract B20FactoryGetTokenAddressTest is B20FactoryTest { /// @notice Wraps an arbitrary uint8 into a valid B20Variant ordinal. diff --git a/test/unit/B20Factory/isB20.t.sol b/test/unit/B20Factory/isB20.t.sol index 7e06310..ba015eb 100644 --- a/test/unit/B20Factory/isB20.t.sol +++ b/test/unit/B20Factory/isB20.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; contract B20FactoryIsB20Test is B20FactoryTest { /// @notice Verifies isB20 returns true for a freshly-created token diff --git a/test/unit/B20Factory/isB20Initialized.t.sol b/test/unit/B20Factory/isB20Initialized.t.sol index 8c9fbe5..384ece4 100644 --- a/test/unit/B20Factory/isB20Initialized.t.sol +++ b/test/unit/B20Factory/isB20Initialized.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; -import {B20FactoryTest} from "test/lib/B20FactoryTest.sol"; +import {B20FactoryTest} from "base-std-test/lib/B20FactoryTest.sol"; contract B20FactoryIsB20InitializedTest is B20FactoryTest { /// @notice Verifies isB20Initialized returns false for any address lacking the B-20 prefix diff --git a/test/unit/B20FactoryLib/buildExtraMetadataUpdates.t.sol b/test/unit/B20FactoryLib/buildExtraMetadataUpdates.t.sol index 52f9bad..1bc8e00 100644 --- a/test/unit/B20FactoryLib/buildExtraMetadataUpdates.t.sol +++ b/test/unit/B20FactoryLib/buildExtraMetadataUpdates.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibBuildExtraMetadataUpdatesTest is B20FactoryLibTest { /// @notice External wrapper that re-exposes diff --git a/test/unit/B20FactoryLib/buildRoleGrants.t.sol b/test/unit/B20FactoryLib/buildRoleGrants.t.sol index f10b3e9..dcccfbd 100644 --- a/test/unit/B20FactoryLib/buildRoleGrants.t.sol +++ b/test/unit/B20FactoryLib/buildRoleGrants.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {B20Constants} from "src/lib/B20Constants.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibBuildRoleGrantsTest is B20FactoryLibTest { /// @notice External wrapper that re-exposes diff --git a/test/unit/B20FactoryLib/concat.t.sol b/test/unit/B20FactoryLib/concat.t.sol index abda112..579ae84 100644 --- a/test/unit/B20FactoryLib/concat.t.sol +++ b/test/unit/B20FactoryLib/concat.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibConcatTest is B20FactoryLibTest { /// @notice Concatenating two empty arrays produces an empty result. diff --git a/test/unit/B20FactoryLib/encodeAssetCreateParams.t.sol b/test/unit/B20FactoryLib/encodeAssetCreateParams.t.sol index e2f3b1e..ee2bd13 100644 --- a/test/unit/B20FactoryLib/encodeAssetCreateParams.t.sol +++ b/test/unit/B20FactoryLib/encodeAssetCreateParams.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeAssetCreateParamsTest is B20FactoryLibTest { /// @notice Verifies the output decodes back to a `B20AssetCreateParams` diff --git a/test/unit/B20FactoryLib/encodeBatchMint.t.sol b/test/unit/B20FactoryLib/encodeBatchMint.t.sol index 3f620e8..8b3b36b 100644 --- a/test/unit/B20FactoryLib/encodeBatchMint.t.sol +++ b/test/unit/B20FactoryLib/encodeBatchMint.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeBatchMintTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20Asset.batchMint, ...)`. diff --git a/test/unit/B20FactoryLib/encodeGrantRole.t.sol b/test/unit/B20FactoryLib/encodeGrantRole.t.sol index 96c21bd..91ddf88 100644 --- a/test/unit/B20FactoryLib/encodeGrantRole.t.sol +++ b/test/unit/B20FactoryLib/encodeGrantRole.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeGrantRoleTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.grantRole, ...)`. diff --git a/test/unit/B20FactoryLib/encodeRevokeRole.t.sol b/test/unit/B20FactoryLib/encodeRevokeRole.t.sol index 997585a..97d8b07 100644 --- a/test/unit/B20FactoryLib/encodeRevokeRole.t.sol +++ b/test/unit/B20FactoryLib/encodeRevokeRole.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeRevokeRoleTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.revokeRole, ...)`. diff --git a/test/unit/B20FactoryLib/encodeSetRoleAdmin.t.sol b/test/unit/B20FactoryLib/encodeSetRoleAdmin.t.sol index 09d009b..4286341 100644 --- a/test/unit/B20FactoryLib/encodeSetRoleAdmin.t.sol +++ b/test/unit/B20FactoryLib/encodeSetRoleAdmin.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeSetRoleAdminTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.setRoleAdmin, ...)`. diff --git a/test/unit/B20FactoryLib/encodeStablecoinCreateParams.t.sol b/test/unit/B20FactoryLib/encodeStablecoinCreateParams.t.sol index e4e0164..0bf4c5a 100644 --- a/test/unit/B20FactoryLib/encodeStablecoinCreateParams.t.sol +++ b/test/unit/B20FactoryLib/encodeStablecoinCreateParams.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeStablecoinCreateParamsTest is B20FactoryLibTest { /// @notice Verifies the output decodes back to a `B20StablecoinCreateParams` diff --git a/test/unit/B20FactoryLib/encodeStablecoinEventParams.t.sol b/test/unit/B20FactoryLib/encodeStablecoinEventParams.t.sol index 08646c0..d78ce2e 100644 --- a/test/unit/B20FactoryLib/encodeStablecoinEventParams.t.sol +++ b/test/unit/B20FactoryLib/encodeStablecoinEventParams.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Factory} from "src/interfaces/IB20Factory.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Factory} from "base-std/interfaces/IB20Factory.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeStablecoinEventParamsTest is B20FactoryLibTest { /// @notice Verifies the output decodes back to a `B20StablecoinEventParams` diff --git a/test/unit/B20FactoryLib/encodeUpdateContractURI.t.sol b/test/unit/B20FactoryLib/encodeUpdateContractURI.t.sol index 4905e09..b1a37ce 100644 --- a/test/unit/B20FactoryLib/encodeUpdateContractURI.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdateContractURI.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdateContractURITest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.updateContractURI, ...)`. diff --git a/test/unit/B20FactoryLib/encodeUpdateExtraMetadata.t.sol b/test/unit/B20FactoryLib/encodeUpdateExtraMetadata.t.sol index 2411d4f..1cab65a 100644 --- a/test/unit/B20FactoryLib/encodeUpdateExtraMetadata.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdateExtraMetadata.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdateExtraMetadataTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches diff --git a/test/unit/B20FactoryLib/encodeUpdateMultiplier.t.sol b/test/unit/B20FactoryLib/encodeUpdateMultiplier.t.sol index 2152af5..f6e0b13 100644 --- a/test/unit/B20FactoryLib/encodeUpdateMultiplier.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdateMultiplier.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20Asset} from "src/interfaces/IB20Asset.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20Asset} from "base-std/interfaces/IB20Asset.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdateMultiplierTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20Asset.updateMultiplier, ...)`. diff --git a/test/unit/B20FactoryLib/encodeUpdateName.t.sol b/test/unit/B20FactoryLib/encodeUpdateName.t.sol index 099769e..39f1e9f 100644 --- a/test/unit/B20FactoryLib/encodeUpdateName.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdateName.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdateNameTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.updateName, ...)`. diff --git a/test/unit/B20FactoryLib/encodeUpdatePolicy.t.sol b/test/unit/B20FactoryLib/encodeUpdatePolicy.t.sol index f058740..1e7cb20 100644 --- a/test/unit/B20FactoryLib/encodeUpdatePolicy.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdatePolicy.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdatePolicyTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.updatePolicy, ...)`. diff --git a/test/unit/B20FactoryLib/encodeUpdateSupplyCap.t.sol b/test/unit/B20FactoryLib/encodeUpdateSupplyCap.t.sol index ed6238d..bd75e42 100644 --- a/test/unit/B20FactoryLib/encodeUpdateSupplyCap.t.sol +++ b/test/unit/B20FactoryLib/encodeUpdateSupplyCap.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20FactoryLib} from "src/lib/B20FactoryLib.sol"; -import {IB20} from "src/interfaces/IB20.sol"; +import {B20FactoryLib} from "base-std/lib/B20FactoryLib.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20FactoryLibTest} from "test/lib/B20FactoryLibTest.sol"; +import {B20FactoryLibTest} from "base-std-test/lib/B20FactoryLibTest.sol"; contract B20FactoryLibEncodeUpdateSupplyCapTest is B20FactoryLibTest { /// @notice Verifies the encoded blob matches `abi.encodeCall(IB20.updateSupplyCap, ...)`. diff --git a/test/unit/B20Stablecoin/currency.t.sol b/test/unit/B20Stablecoin/currency.t.sol index af5c61d..e18f3b7 100644 --- a/test/unit/B20Stablecoin/currency.t.sol +++ b/test/unit/B20Stablecoin/currency.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Stablecoin} from "src/interfaces/IB20Stablecoin.sol"; +import {IB20Stablecoin} from "base-std/interfaces/IB20Stablecoin.sol"; -import {B20StablecoinTest} from "test/lib/B20StablecoinTest.sol"; +import {B20StablecoinTest} from "base-std-test/lib/B20StablecoinTest.sol"; contract B20StablecoinCurrencyTest is B20StablecoinTest { /// @notice Verifies currency returns the string passed to the factory at creation diff --git a/test/unit/PolicyRegistry/createPolicy.t.sol b/test/unit/PolicyRegistry/createPolicy.t.sol index c0bc98a..5b8dd39 100644 --- a/test/unit/PolicyRegistry/createPolicy.t.sol +++ b/test/unit/PolicyRegistry/createPolicy.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryCreatePolicyTest is PolicyRegistryTest { /// @notice Verifies createPolicy reverts when admin is the zero address diff --git a/test/unit/PolicyRegistry/createPolicyWithAccounts.t.sol b/test/unit/PolicyRegistry/createPolicyWithAccounts.t.sol index d8aa7dc..da194cf 100644 --- a/test/unit/PolicyRegistry/createPolicyWithAccounts.t.sol +++ b/test/unit/PolicyRegistry/createPolicyWithAccounts.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryCreatePolicyWithAccountsTest is PolicyRegistryTest { /// @notice Verifies createPolicyWithAccounts reverts when admin is the zero address diff --git a/test/unit/PolicyRegistry/createPolicyWithAccounts_revertOrder.t.sol b/test/unit/PolicyRegistry/createPolicyWithAccounts_revertOrder.t.sol index 75d1678..b6a281f 100644 --- a/test/unit/PolicyRegistry/createPolicyWithAccounts_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/createPolicyWithAccounts_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `createPolicyWithAccounts`. /// diff --git a/test/unit/PolicyRegistry/createPolicyWithAccounts_rollback.t.sol b/test/unit/PolicyRegistry/createPolicyWithAccounts_rollback.t.sol index 5249628..f506076 100644 --- a/test/unit/PolicyRegistry/createPolicyWithAccounts_rollback.t.sol +++ b/test/unit/PolicyRegistry/createPolicyWithAccounts_rollback.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @title PolicyRegistryCreatePolicyWithAccountsRollbackTest /// @notice Verifies a revert from createPolicyWithAccounts leaves no orphan diff --git a/test/unit/PolicyRegistry/createPolicy_revertOrder.t.sol b/test/unit/PolicyRegistry/createPolicy_revertOrder.t.sol index aa033ca..7fe13d2 100644 --- a/test/unit/PolicyRegistry/createPolicy_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/createPolicy_revertOrder.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @title Sequential revert-order test for `createPolicy`. /// diff --git a/test/unit/PolicyRegistry/finalizeUpdateAdmin.t.sol b/test/unit/PolicyRegistry/finalizeUpdateAdmin.t.sol index f5be2c6..c0255e3 100644 --- a/test/unit/PolicyRegistry/finalizeUpdateAdmin.t.sol +++ b/test/unit/PolicyRegistry/finalizeUpdateAdmin.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryFinalizeUpdateAdminTest is PolicyRegistryTest { /// @notice Verifies finalizeUpdateAdmin reverts when no admin transfer is in flight diff --git a/test/unit/PolicyRegistry/finalizeUpdateAdmin_revertOrder.t.sol b/test/unit/PolicyRegistry/finalizeUpdateAdmin_revertOrder.t.sol index 26c5d04..ff52efe 100644 --- a/test/unit/PolicyRegistry/finalizeUpdateAdmin_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/finalizeUpdateAdmin_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `finalizeUpdateAdmin`. /// diff --git a/test/unit/PolicyRegistry/isAuthorized.t.sol b/test/unit/PolicyRegistry/isAuthorized.t.sol index a1923f1..5f47555 100644 --- a/test/unit/PolicyRegistry/isAuthorized.t.sol +++ b/test/unit/PolicyRegistry/isAuthorized.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract PolicyRegistryIsAuthorizedTest is PolicyRegistryTest { /// @notice Verifies isAuthorized on an uncreated ALLOWLIST id returns false diff --git a/test/unit/PolicyRegistry/pendingPolicyAdmin.t.sol b/test/unit/PolicyRegistry/pendingPolicyAdmin.t.sol index b1dd207..11cd724 100644 --- a/test/unit/PolicyRegistry/pendingPolicyAdmin.t.sol +++ b/test/unit/PolicyRegistry/pendingPolicyAdmin.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; contract PolicyRegistryPendingPolicyAdminTest is PolicyRegistryTest { /// @notice Verifies pendingPolicyAdmin returns address(0) before any transfer is staged diff --git a/test/unit/PolicyRegistry/policyAdmin.t.sol b/test/unit/PolicyRegistry/policyAdmin.t.sol index a5ac906..e0e73aa 100644 --- a/test/unit/PolicyRegistry/policyAdmin.t.sol +++ b/test/unit/PolicyRegistry/policyAdmin.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract PolicyRegistryPolicyAdminTest is PolicyRegistryTest { /// @notice Verifies policyAdmin returns address(0) for a well-formed but uncreated id diff --git a/test/unit/PolicyRegistry/policyExists.t.sol b/test/unit/PolicyRegistry/policyExists.t.sol index 4ec8601..8fe89ee 100644 --- a/test/unit/PolicyRegistry/policyExists.t.sol +++ b/test/unit/PolicyRegistry/policyExists.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; contract PolicyRegistryPolicyExistsTest is PolicyRegistryTest { function test_policyExists_success_builtinAlwaysAllow() public view { diff --git a/test/unit/PolicyRegistry/renounceAdmin.t.sol b/test/unit/PolicyRegistry/renounceAdmin.t.sol index 99bdf1c..4646db0 100644 --- a/test/unit/PolicyRegistry/renounceAdmin.t.sol +++ b/test/unit/PolicyRegistry/renounceAdmin.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryRenounceAdminTest is PolicyRegistryTest { /// @notice Verifies renounceAdmin reverts when called by any non-admin caller diff --git a/test/unit/PolicyRegistry/renounceAdmin_revertOrder.t.sol b/test/unit/PolicyRegistry/renounceAdmin_revertOrder.t.sol index 1d33513..0ba8458 100644 --- a/test/unit/PolicyRegistry/renounceAdmin_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/renounceAdmin_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `renounceAdmin`. /// diff --git a/test/unit/PolicyRegistry/stageUpdateAdmin.t.sol b/test/unit/PolicyRegistry/stageUpdateAdmin.t.sol index 2ab110d..255f40d 100644 --- a/test/unit/PolicyRegistry/stageUpdateAdmin.t.sol +++ b/test/unit/PolicyRegistry/stageUpdateAdmin.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryStageUpdateAdminTest is PolicyRegistryTest { /// @notice Verifies stageUpdateAdmin reverts when called by any non-admin caller diff --git a/test/unit/PolicyRegistry/stageUpdateAdmin_revertOrder.t.sol b/test/unit/PolicyRegistry/stageUpdateAdmin_revertOrder.t.sol index 62e0178..fcb3c08 100644 --- a/test/unit/PolicyRegistry/stageUpdateAdmin_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/stageUpdateAdmin_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `stageUpdateAdmin`. /// diff --git a/test/unit/PolicyRegistry/updateAllowlist.t.sol b/test/unit/PolicyRegistry/updateAllowlist.t.sol index 11a1cb3..fc1942a 100644 --- a/test/unit/PolicyRegistry/updateAllowlist.t.sol +++ b/test/unit/PolicyRegistry/updateAllowlist.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryUpdateAllowlistTest is PolicyRegistryTest { /// @notice Verifies updateAllowlist reverts when called by any non-admin caller diff --git a/test/unit/PolicyRegistry/updateAllowlist_revertOrder.t.sol b/test/unit/PolicyRegistry/updateAllowlist_revertOrder.t.sol index 701a03e..ceee5db 100644 --- a/test/unit/PolicyRegistry/updateAllowlist_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/updateAllowlist_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `updateAllowlist`. /// diff --git a/test/unit/PolicyRegistry/updateBlocklist.t.sol b/test/unit/PolicyRegistry/updateBlocklist.t.sol index 44fb275..6f521b8 100644 --- a/test/unit/PolicyRegistry/updateBlocklist.t.sol +++ b/test/unit/PolicyRegistry/updateBlocklist.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; contract PolicyRegistryUpdateBlocklistTest is PolicyRegistryTest { /// @notice Verifies updateBlocklist reverts when called by any non-admin caller diff --git a/test/unit/PolicyRegistry/updateBlocklist_revertOrder.t.sol b/test/unit/PolicyRegistry/updateBlocklist_revertOrder.t.sol index 3433aea..b6385f8 100644 --- a/test/unit/PolicyRegistry/updateBlocklist_revertOrder.t.sol +++ b/test/unit/PolicyRegistry/updateBlocklist_revertOrder.t.sol @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; /// @title Sequential revert-order test for `updateBlocklist`. /// diff --git a/test/unit/PolicyRegistry/writeBuiltins.t.sol b/test/unit/PolicyRegistry/writeBuiltins.t.sol index 4ee97bd..8a8816a 100644 --- a/test/unit/PolicyRegistry/writeBuiltins.t.sol +++ b/test/unit/PolicyRegistry/writeBuiltins.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Tests for the lazy built-in-policy initialization that mirrors /// the Rust precompile's `PolicyRegistryStorage::write_builtins`. diff --git a/test/unit/storage/B20AssetFullLayout.t.sol b/test/unit/storage/B20AssetFullLayout.t.sol index 82adc26..33789fc 100644 --- a/test/unit/storage/B20AssetFullLayout.t.sol +++ b/test/unit/storage/B20AssetFullLayout.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {B20Constants} from "src/lib/B20Constants.sol"; +import {B20Constants} from "base-std/lib/B20Constants.sol"; -import {B20AssetTest} from "test/lib/B20AssetTest.sol"; -import {MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20AssetTest} from "base-std-test/lib/B20AssetTest.sol"; +import {MockB20AssetStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @notice Exhaustive layout spec for the `base.b20.asset` namespace. /// diff --git a/test/unit/storage/B20FullLayout.t.sol b/test/unit/storage/B20FullLayout.t.sol index 9366602..2b152fc 100644 --- a/test/unit/storage/B20FullLayout.t.sol +++ b/test/unit/storage/B20FullLayout.t.sol @@ -1,14 +1,14 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; -import {StdPrecompiles} from "src/StdPrecompiles.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; +import {StdPrecompiles} from "base-std/StdPrecompiles.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @notice Exhaustive layout spec for the `base.b20` namespace. /// diff --git a/test/unit/storage/B20StablecoinFullLayout.t.sol b/test/unit/storage/B20StablecoinFullLayout.t.sol index ef6087c..7faaa4b 100644 --- a/test/unit/storage/B20StablecoinFullLayout.t.sol +++ b/test/unit/storage/B20StablecoinFullLayout.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Stablecoin} from "src/interfaces/IB20Stablecoin.sol"; +import {IB20Stablecoin} from "base-std/interfaces/IB20Stablecoin.sol"; -import {B20StablecoinTest} from "test/lib/B20StablecoinTest.sol"; -import {MockB20StablecoinStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20StablecoinTest} from "base-std-test/lib/B20StablecoinTest.sol"; +import {MockB20StablecoinStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @notice Exhaustive layout spec for the `base.b20.stablecoin` namespace. /// diff --git a/test/unit/storage/MockActivationRegistrySlotHelpers.t.sol b/test/unit/storage/MockActivationRegistrySlotHelpers.t.sol index e36bb6f..8b3b4b2 100644 --- a/test/unit/storage/MockActivationRegistrySlotHelpers.t.sol +++ b/test/unit/storage/MockActivationRegistrySlotHelpers.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {ActivationRegistryTest} from "test/lib/ActivationRegistryTest.sol"; -import {MockActivationRegistryStorage} from "test/lib/mocks/MockActivationRegistryStorage.sol"; +import {ActivationRegistryTest} from "base-std-test/lib/ActivationRegistryTest.sol"; +import {MockActivationRegistryStorage} from "base-std-test/lib/mocks/MockActivationRegistryStorage.sol"; /// @notice Self-tests for `MockActivationRegistryStorage`'s slot-derivation helpers. /// diff --git a/test/unit/storage/MockActivationRegistryStorage.t.sol b/test/unit/storage/MockActivationRegistryStorage.t.sol index c85a467..b5d519f 100644 --- a/test/unit/storage/MockActivationRegistryStorage.t.sol +++ b/test/unit/storage/MockActivationRegistryStorage.t.sol @@ -3,9 +3,9 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {MockActivationRegistryStorage} from "test/lib/mocks/MockActivationRegistryStorage.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {MockActivationRegistryStorage} from "base-std-test/lib/mocks/MockActivationRegistryStorage.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Asserts the hardcoded `STORAGE_LOCATION` constant on /// `MockActivationRegistryStorage` matches the ERC-7201 formula it documents. diff --git a/test/unit/storage/MockB20SlotHelpers.t.sol b/test/unit/storage/MockB20SlotHelpers.t.sol index 95dde90..1246601 100644 --- a/test/unit/storage/MockB20SlotHelpers.t.sol +++ b/test/unit/storage/MockB20SlotHelpers.t.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20} from "src/interfaces/IB20.sol"; +import {IB20} from "base-std/interfaces/IB20.sol"; -import {B20Test} from "test/lib/B20Test.sol"; -import {MockB20, B20Constants} from "test/lib/mocks/MockB20.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistry, PolicyRegistryConstants} from "test/lib/mocks/MockPolicyRegistry.sol"; +import {B20Test} from "base-std-test/lib/B20Test.sol"; +import {MockB20, B20Constants} from "base-std-test/lib/mocks/MockB20.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistry, PolicyRegistryConstants} from "base-std-test/lib/mocks/MockPolicyRegistry.sol"; /// @notice Self-tests for `MockB20Storage`'s slot-derivation and /// packed-slot codec helpers. Each test sets a known value via diff --git a/test/unit/storage/MockB20StablecoinSlotHelpers.t.sol b/test/unit/storage/MockB20StablecoinSlotHelpers.t.sol index 1598bfd..41a8810 100644 --- a/test/unit/storage/MockB20StablecoinSlotHelpers.t.sol +++ b/test/unit/storage/MockB20StablecoinSlotHelpers.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IB20Stablecoin} from "src/interfaces/IB20Stablecoin.sol"; +import {IB20Stablecoin} from "base-std/interfaces/IB20Stablecoin.sol"; -import {B20StablecoinTest} from "test/lib/B20StablecoinTest.sol"; -import {MockB20StablecoinStorage} from "test/lib/mocks/MockB20Storage.sol"; +import {B20StablecoinTest} from "base-std-test/lib/B20StablecoinTest.sol"; +import {MockB20StablecoinStorage} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @notice Self-tests for `MockB20StablecoinStorage`'s slot helper. /// diff --git a/test/unit/storage/MockB20Storage.t.sol b/test/unit/storage/MockB20Storage.t.sol index c0bf8b5..1628552 100644 --- a/test/unit/storage/MockB20Storage.t.sol +++ b/test/unit/storage/MockB20Storage.t.sol @@ -3,7 +3,11 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {MockB20Storage, MockB20StablecoinStorage, MockB20AssetStorage} from "test/lib/mocks/MockB20Storage.sol"; +import { + MockB20Storage, + MockB20StablecoinStorage, + MockB20AssetStorage +} from "base-std-test/lib/mocks/MockB20Storage.sol"; /// @notice Asserts the hardcoded `STORAGE_LOCATION` constants on the B-20 /// storage libraries match the ERC-7201 formula they document. diff --git a/test/unit/storage/MockPolicyRegistrySlotHelpers.t.sol b/test/unit/storage/MockPolicyRegistrySlotHelpers.t.sol index 43d0f2f..53cb884 100644 --- a/test/unit/storage/MockPolicyRegistrySlotHelpers.t.sol +++ b/test/unit/storage/MockPolicyRegistrySlotHelpers.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Self-tests for `MockPolicyRegistryStorage`'s slot-derivation /// and packed-slot codec helpers. diff --git a/test/unit/storage/MockPolicyRegistryStorage.t.sol b/test/unit/storage/MockPolicyRegistryStorage.t.sol index f3d1f45..4e1f472 100644 --- a/test/unit/storage/MockPolicyRegistryStorage.t.sol +++ b/test/unit/storage/MockPolicyRegistryStorage.t.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.20; import {Test} from "forge-std/Test.sol"; -import {MockB20Storage} from "test/lib/mocks/MockB20Storage.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {MockB20Storage} from "base-std-test/lib/mocks/MockB20Storage.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Asserts the hardcoded `STORAGE_LOCATION` constant on /// `MockPolicyRegistryStorage` matches the ERC-7201 formula it documents. diff --git a/test/unit/storage/PolicyRegistryFullLayout.t.sol b/test/unit/storage/PolicyRegistryFullLayout.t.sol index 77b6c47..02ed3ca 100644 --- a/test/unit/storage/PolicyRegistryFullLayout.t.sol +++ b/test/unit/storage/PolicyRegistryFullLayout.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.20; -import {IPolicyRegistry} from "src/interfaces/IPolicyRegistry.sol"; +import {IPolicyRegistry} from "base-std/interfaces/IPolicyRegistry.sol"; -import {PolicyRegistryTest} from "test/lib/PolicyRegistryTest.sol"; -import {MockPolicyRegistryStorage} from "test/lib/mocks/MockPolicyRegistryStorage.sol"; +import {PolicyRegistryTest} from "base-std-test/lib/PolicyRegistryTest.sol"; +import {MockPolicyRegistryStorage} from "base-std-test/lib/mocks/MockPolicyRegistryStorage.sol"; /// @notice Exhaustive layout spec for the `base.policy_registry` namespace. ///