Merge branch 'main' of github.com:OpenZeppelin/cairo-contracts into f…

…eat/remove-mocks-from-released-package-#1141
OpenZeppelin · Oct 6, 2024 · fda9095 · fda9095
2 parents 72451fa + 32a8d2b
commit fda9095
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/Scarb.lock b/Scarb.lock
@@ -62,6 +62,7 @@ dependencies = [
  "openzeppelin_introspection",
  "openzeppelin_test_common",
  "openzeppelin_testing",
+ "openzeppelin_utils",
  "snforge_std",
 ]
 

diff --git a/packages/account/src/extensions/src9/src9.cairo b/packages/account/src/extensions/src9/src9.cairo
@@ -10,6 +10,7 @@
 /// interface.
 #[starknet::component]
 pub mod SRC9Component {
+    use crate::dual_account::{DualCaseAccount, DualCaseAccountTrait};
     use crate::extensions::src9::OutsideExecution;
     use crate::extensions::src9::interface;
     use crate::extensions::src9::snip12_utils::OutsideExecutionStructHash;

diff --git a/packages/finance/src/tests/test_vesting_linear.cairo b/packages/finance/src/tests/test_vesting_linear.cairo
@@ -1,9 +1,9 @@
+use crate::tests::common::{VestingStrategy, TestData, setup, set_transfer_to_fail};
+use crate::tests::mocks::vesting_mocks::LinearVestingMock;
+use crate::vesting::VestingComponent::InternalImpl;
+use crate::vesting::VestingComponent;
+use crate::vesting::interface::IVestingDispatcherTrait;
 use openzeppelin_access::ownable::interface::{IOwnableDispatcher, IOwnableDispatcherTrait};
-use openzeppelin_finance::tests::common::{VestingStrategy, TestData, setup, set_transfer_to_fail};
-use openzeppelin_finance::vesting::VestingComponent::InternalImpl;
-use openzeppelin_finance::vesting::VestingComponent;
-use openzeppelin_finance::vesting::interface::IVestingDispatcherTrait;
-use openzeppelin_test_common::mocks::vesting::LinearVestingMock;
 use openzeppelin_test_common::vesting::VestingSpyHelpers;
 use openzeppelin_testing::constants::{OWNER, OTHER};
 use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};

diff --git a/packages/finance/src/tests/test_vesting_steps.cairo b/packages/finance/src/tests/test_vesting_steps.cairo
@@ -1,9 +1,9 @@
+use crate::tests::common::{VestingStrategy, TestData, setup, set_transfer_to_fail};
+use crate::tests::mocks::vesting_mocks::StepsVestingMock;
+use crate::vesting::VestingComponent::InternalImpl;
+use crate::vesting::VestingComponent;
+use crate::vesting::interface::IVestingDispatcherTrait;
 use openzeppelin_access::ownable::interface::{IOwnableDispatcher, IOwnableDispatcherTrait};
-use openzeppelin_finance::tests::common::{VestingStrategy, TestData, setup, set_transfer_to_fail};
-use openzeppelin_finance::vesting::VestingComponent::InternalImpl;
-use openzeppelin_finance::vesting::VestingComponent;
-use openzeppelin_finance::vesting::interface::IVestingDispatcherTrait;
-use openzeppelin_test_common::mocks::vesting::StepsVestingMock;
 use openzeppelin_test_common::vesting::VestingSpyHelpers;
 use openzeppelin_testing::constants::{OWNER, OTHER};
 use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};

diff --git a/packages/finance/src/vesting/vesting.cairo b/packages/finance/src/vesting/vesting.cairo
@@ -29,9 +29,9 @@ use starknet::ContractAddress;
 ///   vesting schedule to ensure the vested amount is as intended.
 #[starknet::component]
 pub mod VestingComponent {
+    use crate::vesting::interface;
     use openzeppelin_access::ownable::OwnableComponent::OwnableImpl;
     use openzeppelin_access::ownable::OwnableComponent;
-    use openzeppelin_finance::vesting::interface;
     use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
     use starknet::ContractAddress;
     use starknet::storage::{Map, StorageMapReadAccess, StorageMapWriteAccess};

diff --git a/packages/governance/Scarb.toml b/packages/governance/Scarb.toml
@@ -29,6 +29,7 @@ openzeppelin_introspection = { path = "../introspection" }
 [dev-dependencies]
 assert_macros.workspace = true
 snforge_std.workspace = true
+openzeppelin_utils = { path = "../utils" }
 openzeppelin_testing = { path = "../testing" }
 openzeppelin_test_common = { path = "../test_common" }
 

diff --git a/packages/security/src/interface.cairo b/packages/security/src/interface.cairo
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts for Cairo v0.17.0 (security/interface.cairo)
+
 #[starknet::interface]
 pub trait IInitializable<TState> {
     fn is_initialized(self: @TState) -> bool;

diff --git a/packages/test_common/src/mocks/vesting.cairo b/packages/test_common/src/mocks/vesting.cairo
@@ -1,7 +1,7 @@
 #[starknet::contract]
 pub mod LinearVestingMock {
+    use crate::vesting::{VestingComponent, LinearVestingSchedule};
     use openzeppelin_access::ownable::OwnableComponent;
-    use openzeppelin_finance::vesting::{VestingComponent, LinearVestingSchedule};
     use starknet::ContractAddress;
 
     component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
@@ -49,9 +49,9 @@ pub mod LinearVestingMock {
 
 #[starknet::contract]
 pub mod StepsVestingMock {
+    use crate::vesting::VestingComponent::VestingScheduleTrait;
+    use crate::vesting::VestingComponent;
     use openzeppelin_access::ownable::OwnableComponent;
-    use openzeppelin_finance::vesting::VestingComponent::VestingScheduleTrait;
-    use openzeppelin_finance::vesting::VestingComponent;
     use starknet::ContractAddress;
     use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};