Use OZ account preset instead of a local copy

carbonable-labs · Mar 26, 2024 · f6ad3e7 · f6ad3e7
1 parent c7f4f04
commit f6ad3e7
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 262 deletions.
diff --git a/src/tests.cairo b/src/tests.cairo
@@ -13,7 +13,6 @@ mod unit {
 }
 
 mod mocks {
-    mod account;
     mod receiver;
     mod contracts;
 }

diff --git a/src/tests/integration/test_base.cairo b/src/tests/integration/test_base.cairo
@@ -11,14 +11,14 @@ use starknet::testing;
 // External deps
 use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait, ISRC5_ID};
 use openzeppelin::token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID};
+use openzeppelin::presets::Account;
 
 // Local deps
 use cairo_erc_3525::interface::{IERC3525Dispatcher, IERC3525DispatcherTrait, IERC3525_ID};
 use cairo_erc_3525::presets::erc3525_mintable_burnable::{
     ERC3525MintableBurnable, IExternalDispatcher, IExternalDispatcherTrait
 };
 use cairo_erc_3525::tests::integration::constants;
-use cairo_erc_3525::tests::mocks::account::Account;
 
 #[derive(Drop)]
 struct Signers {

diff --git a/src/tests/integration/test_metadata.cairo b/src/tests/integration/test_metadata.cairo
@@ -11,6 +11,7 @@ use starknet::testing;
 // External deps
 use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait, ISRC5_ID};
 use openzeppelin::token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID};
+use openzeppelin::presets::Account;
 
 // Local deps
 use cairo_erc_3525::interface::{IERC3525Dispatcher, IERC3525DispatcherTrait, IERC3525_ID};
@@ -21,7 +22,6 @@ use cairo_erc_3525::extensions::metadata::interface::{
     IERC3525MetadataDispatcher, IERC3525MetadataDispatcherTrait, IERC3525_METADATA_ID
 };
 use cairo_erc_3525::tests::integration::constants;
-use cairo_erc_3525::tests::mocks::account::Account;
 
 #[derive(Drop)]
 struct Signers {

diff --git a/src/tests/integration/test_receiver.cairo b/src/tests/integration/test_receiver.cairo
@@ -11,6 +11,7 @@ use starknet::testing;
 // External deps
 use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait, ISRC5_ID};
 use openzeppelin::token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID};
+use openzeppelin::presets::Account;
 
 // Local deps
 use cairo_erc_3525::interface::{IERC3525Dispatcher, IERC3525DispatcherTrait, IERC3525_ID};
@@ -19,7 +20,6 @@ use cairo_erc_3525::presets::erc3525_mintable_burnable::{
 };
 use cairo_erc_3525::tests::integration::constants;
 use cairo_erc_3525::tests::mocks::receiver::{IReceiverDispatcher, IReceiverDispatcherTrait};
-use cairo_erc_3525::tests::mocks::account::Account;
 use cairo_erc_3525::tests::mocks::receiver::Receiver;
 
 #[derive(Drop)]

diff --git a/src/tests/integration/test_slot_approvable.cairo b/src/tests/integration/test_slot_approvable.cairo
@@ -11,6 +11,7 @@ use starknet::testing;
 // External deps
 use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait, ISRC5_ID};
 use openzeppelin::token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID};
+use openzeppelin::presets::Account;
 
 // Local deps
 use cairo_erc_3525::interface::{IERC3525Dispatcher, IERC3525DispatcherTrait, IERC3525_ID};
@@ -22,7 +23,6 @@ use cairo_erc_3525::extensions::slotapprovable::interface::{
     IERC3525_SLOT_APPROVABLE_ID
 };
 use cairo_erc_3525::tests::integration::constants;
-use cairo_erc_3525::tests::mocks::account::Account;
 
 #[derive(Drop)]
 struct Signers {

diff --git a/src/tests/integration/test_slot_enumerable.cairo b/src/tests/integration/test_slot_enumerable.cairo
@@ -11,6 +11,7 @@ use starknet::testing;
 // External deps
 use openzeppelin::introspection::interface::{ISRC5Dispatcher, ISRC5DispatcherTrait, ISRC5_ID};
 use openzeppelin::token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait, IERC721_ID};
+use openzeppelin::presets::Account;
 
 // Local deps
 use cairo_erc_3525::interface::{IERC3525Dispatcher, IERC3525DispatcherTrait, IERC3525_ID};
@@ -22,7 +23,6 @@ use cairo_erc_3525::extensions::slotenumerable::interface::{
     IERC3525_SLOT_ENUMERABLE_ID
 };
 use cairo_erc_3525::tests::integration::constants;
-use cairo_erc_3525::tests::mocks::account::Account;
 
 use debug::PrintTrait;
 

diff --git a/src/tests/mocks/account.cairo b/src/tests/mocks/account.cairo
diff --git a/src/tests/unit/test_metadata.cairo b/src/tests/unit/test_metadata.cairo
@@ -11,10 +11,10 @@ use starknet::testing::set_caller_address;
 // External imports
 
 use openzeppelin::token::erc721::erc721::ERC721Component;
+use openzeppelin::presets::Account;
 
 // Local imports
 
-use cairo_erc_3525::tests::mocks::account::Account;
 use cairo_erc_3525::module::ERC3525Component;
 use cairo_erc_3525::extensions::metadata::module::ERC3525MetadataComponent::{ ERC3525MetadataImpl, InternalImpl };
 use cairo_erc_3525::extensions::metadata::module::ERC3525MetadataComponent;

diff --git a/src/tests/unit/test_slot_enumerable.cairo b/src/tests/unit/test_slot_enumerable.cairo
@@ -12,10 +12,10 @@ use starknet::testing::set_caller_address;
 
 use openzeppelin::token::erc721::erc721::ERC721Component::{ ERC721Impl, InternalImpl as ERC721InternalImpl };
 use openzeppelin::token::erc721::erc721::ERC721Component;
+use openzeppelin::presets::Account;
 
 // Local imports
 
-use cairo_erc_3525::tests::mocks::account::Account;
 use cairo_erc_3525::module::ERC3525Component::{ ERC3525Impl, InternalImpl };
 use cairo_erc_3525::module::ERC3525Component;
 use cairo_erc_3525::extensions::slotenumerable::module::ERC3525SlotEnumerableComponent::{

diff --git a/src/tests/unit/test_transfer_to_address.cairo b/src/tests/unit/test_transfer_to_address.cairo
@@ -12,10 +12,10 @@ use starknet::testing::set_caller_address;
 
 use openzeppelin::token::erc721::erc721::ERC721Component::{ ERC721Impl, InternalImpl as ERC721InternalImpl };
 use openzeppelin::token::erc721::erc721::ERC721Component;
+use openzeppelin::presets::Account;
 
 // Local imports
 
-use cairo_erc_3525::tests::mocks::account::Account;
 use cairo_erc_3525::module::ERC3525Component::{ ERC3525Impl, InternalImpl };
 use cairo_erc_3525::module::ERC3525Component;
 use cairo_erc_3525::tests::unit::constants::{

diff --git a/src/tests/unit/test_transfer_to_token.cairo b/src/tests/unit/test_transfer_to_token.cairo
@@ -12,10 +12,10 @@ use starknet::testing::set_caller_address;
 
 use openzeppelin::token::erc721::erc721::ERC721Component::{ ERC721Impl, InternalImpl as ERC721InternalImpl };
 use openzeppelin::token::erc721::erc721::ERC721Component;
+use openzeppelin::presets::Account;
 
 // Local imports
 
-use cairo_erc_3525::tests::mocks::account::Account;
 use cairo_erc_3525::module::ERC3525Component::{ ERC3525Impl, InternalImpl };
 use cairo_erc_3525::module::ERC3525Component;
 use cairo_erc_3525::tests::unit::constants::{