Update tests

OpenZeppelin · Sep 25, 2024 · 1c2fc82 · 1c2fc82
1 parent 950205e
commit 1c2fc82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/packages/token/src/tests/erc20/test_erc20_permit.cairo b/packages/token/src/tests/erc20/test_erc20_permit.cairo
@@ -1,11 +1,8 @@
 use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::PoseidonTrait;
 use crate::erc20::ERC20Component::{ERC20MixinImpl, InternalImpl};
-use crate::erc20::extensions::ERC20PermitComponent::{ERC20PermitImpl, SNIP12MetadataExternalImpl};
-use crate::erc20::extensions::erc20_permit::erc20_permit::{Permit, PERMIT_TYPE_HASH};
-use crate::erc20::extensions::erc20_permit::interface::{
-    ERC20PermitABIDispatcher, ERC20PermitABIDispatcherTrait
-};
+use crate::erc20::extensions::erc20_permit::{Permit, PERMIT_TYPE_HASH};
+use crate::erc20::interface::{ERC20PermitABIDispatcher, ERC20PermitABIDispatcherTrait};
 use openzeppelin_testing as utils;
 use openzeppelin_testing::constants;
 use openzeppelin_testing::signing::{StarkKeyPair, StarkSerializedSigning};

diff --git a/packages/token/src/tests/mocks/erc20_permit_mocks.cairo b/packages/token/src/tests/mocks/erc20_permit_mocks.cairo
@@ -1,37 +1,32 @@
 #[starknet::contract]
 pub(crate) mod DualCaseERC20PermitMock {
-    use crate::erc20::extensions::ERC20PermitComponent;
     use crate::erc20::{ERC20Component, ERC20HooksEmptyImpl};
     use openzeppelin_utils::cryptography::nonces::NoncesComponent;
     use openzeppelin_utils::cryptography::snip12::SNIP12Metadata;
     use starknet::ContractAddress;
 
     component!(path: ERC20Component, storage: erc20, event: ERC20Event);
-    component!(path: ERC20PermitComponent, storage: erc20_permit, event: ERC20PermitEvent);
     component!(path: NoncesComponent, storage: nonces, event: NoncesEvent);
 
     // ERC20Mixin
     #[abi(embed_v0)]
     impl ERC20MixinImpl = ERC20Component::ERC20MixinImpl<ContractState>;
     impl InternalImpl = ERC20Component::InternalImpl<ContractState>;
 
-    // ERC20Permit
+    // IERC20Permit
     #[abi(embed_v0)]
-    impl ERC20PermitComponentImpl =
-        ERC20PermitComponent::ERC20PermitImpl<ContractState>;
+    impl ERC20PermitImpl = ERC20Component::ERC20PermitImpl<ContractState>;
 
-    // SNIP12Metadata
+    // ISNIP12Metadata
     #[abi(embed_v0)]
-    impl SNIP12MetadataExternalImpl =
-        ERC20PermitComponent::SNIP12MetadataExternalImpl<ContractState>;
+    impl SNIP12MetadataExternal =
+        ERC20Component::SNIP12MetadataExternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
         erc20: ERC20Component::Storage,
         #[substorage(v0)]
-        erc20_permit: ERC20PermitComponent::Storage,
-        #[substorage(v0)]
         nonces: NoncesComponent::Storage
     }
 
@@ -41,8 +36,6 @@ pub(crate) mod DualCaseERC20PermitMock {
         #[flat]
         ERC20Event: ERC20Component::Event,
         #[flat]
-        ERC20PermitEvent: ERC20PermitComponent::Event,
-        #[flat]
         NoncesEvent: NoncesComponent::Event
     }