chore: move away from ICS codes in types

informalsystems · Sep 2, 2024 · d8d5201 · d8d5201
1 parent 8d0750e
commit d8d5201
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/cairo-contracts/apps/src/tests/setup/transfer.cairo b/cairo-contracts/apps/src/tests/setup/transfer.cairo
@@ -3,7 +3,7 @@ use openzeppelin_testing::{declare_class, declare_and_deploy};
 use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::{EventSpy, spy_events, ContractClass};
 use starknet::ContractAddress;
-use starknet_ibc_apps::transfer::components::ICS20TransferComponent::{
+use starknet_ibc_apps::transfer::components::TokenTransferComponent::{
     Event, SendEvent, RecvEvent, CreateTokenEvent
 };
 use starknet_ibc_apps::transfer::types::{MsgTransfer, Participant, PrefixedDenom, Memo};

diff --git a/cairo-contracts/apps/src/transfer/components.cairo b/cairo-contracts/apps/src/transfer/components.cairo
@@ -2,4 +2,4 @@ mod transfer;
 mod transferrable;
 
 pub use transferrable::TransferrableComponent;
-pub use transfer::ICS20TransferComponent;
+pub use transfer::TokenTransferComponent;
diff --git a/cairo-contracts/apps/src/transfer/components/transfer.cairo b/cairo-contracts/apps/src/transfer/components/transfer.cairo
@@ -1,5 +1,5 @@
 #[starknet::component]
-pub mod ICS20TransferComponent {
+pub mod TokenTransferComponent {
     use core::array::ArrayTrait;
     use core::clone::Clone;
     use core::num::traits::Zero;

diff --git a/cairo-contracts/contracts/src/apps/transfer.cairo b/cairo-contracts/contracts/src/apps/transfer.cairo
@@ -1,34 +1,34 @@
 #[starknet::contract]
 pub mod TransferApp {
     use starknet::ClassHash;
-    use starknet_ibc_apps::transfer::components::{ICS20TransferComponent, TransferrableComponent};
+    use starknet_ibc_apps::transfer::components::{TokenTransferComponent, TransferrableComponent};
     use starknet_ibc_utils::governance::IBCGovernanceComponent;
 
     component!(path: IBCGovernanceComponent, storage: governance, event: IBCGovernanceEvent);
     component!(path: TransferrableComponent, storage: transferrable, event: TransferrableEvent);
-    component!(path: ICS20TransferComponent, storage: transfer, event: ICS20TransferEvent);
+    component!(path: TokenTransferComponent, storage: transfer, event: TokenTransferEvent);
 
     #[abi(embed_v0)]
     impl IBCGovernanceImpl = IBCGovernanceComponent::Governance<ContractState>;
     impl IBCGovernanceInternalImpl = IBCGovernanceComponent::GovernanceInternalImpl<ContractState>;
 
     #[abi(embed_v0)]
-    impl ICS20TransferreableImpl =
+    impl TokenTransferreableImpl =
         TransferrableComponent::Transferrable<ContractState>;
-    impl ICS20TransferreableInternal =
+    impl TokenTransferreableInternal =
         TransferrableComponent::TransferrableInternalImpl<ContractState>;
 
     #[abi(embed_v0)]
-    impl ICS20SendTransferImpl =
-        ICS20TransferComponent::SendTransfer<ContractState>;
+    impl TokenSendTransferImpl =
+        TokenTransferComponent::SendTransfer<ContractState>;
     #[abi(embed_v0)]
-    impl ICS20RecvPacketImpl = ICS20TransferComponent::RecvPacket<ContractState>;
+    impl TokenRecvPacketImpl = TokenTransferComponent::RecvPacket<ContractState>;
     #[abi(embed_v0)]
-    impl ICS20TokenAddressImpl =
-        ICS20TransferComponent::IBCTokenAddress<ContractState>;
-    impl TransferValidationImpl = ICS20TransferComponent::TransferValidationImpl<ContractState>;
-    impl TransferExecutionImpl = ICS20TransferComponent::TransferExecutionImpl<ContractState>;
-    impl TransferInternalImpl = ICS20TransferComponent::TransferInternalImpl<ContractState>;
+    impl TokenTokenAddressImpl =
+        TokenTransferComponent::IBCTokenAddress<ContractState>;
+    impl TransferValidationImpl = TokenTransferComponent::TransferValidationImpl<ContractState>;
+    impl TransferExecutionImpl = TokenTransferComponent::TransferExecutionImpl<ContractState>;
+    impl TransferInternalImpl = TokenTransferComponent::TransferInternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
@@ -37,7 +37,7 @@ pub mod TransferApp {
         #[substorage(v0)]
         transferrable: TransferrableComponent::Storage,
         #[substorage(v0)]
-        transfer: ICS20TransferComponent::Storage,
+        transfer: TokenTransferComponent::Storage,
     }
 
     #[event]
@@ -48,7 +48,7 @@ pub mod TransferApp {
         #[flat]
         TransferrableEvent: TransferrableComponent::Event,
         #[flat]
-        ICS20TransferEvent: ICS20TransferComponent::Event,
+        TokenTransferEvent: TokenTransferComponent::Event,
     }
 
     #[constructor]

diff --git a/cairo-contracts/contracts/src/tests/mocks/transfer_mock.cairo b/cairo-contracts/contracts/src/tests/mocks/transfer_mock.cairo
@@ -5,7 +5,7 @@
 pub(crate) mod MockTransferApp {
     use starknet::ClassHash;
     use starknet::ContractAddress;
-    use starknet_ibc_apps::transfer::components::{ICS20TransferComponent, TransferrableComponent};
+    use starknet_ibc_apps::transfer::components::{TokenTransferComponent, TransferrableComponent};
     use starknet_ibc_apps::transfer::types::{
         PrefixedDenom, Denom, DenomTrait, PacketData, TracePrefix, Memo, TracePrefixTrait,
         PrefixedDenomTrait
@@ -14,31 +14,31 @@ pub(crate) mod MockTransferApp {
     use starknet_ibc_core::host::{PortId, ChannelId, ChannelIdTrait};
 
     component!(path: TransferrableComponent, storage: transferrable, event: TransferrableEvent);
-    component!(path: ICS20TransferComponent, storage: transfer, event: ICS20TransferEvent);
+    component!(path: TokenTransferComponent, storage: transfer, event: TokenTransferEvent);
 
     #[abi(embed_v0)]
-    impl ICS20TransferreableImpl =
+    impl TokenTransferreableImpl =
         TransferrableComponent::Transferrable<ContractState>;
-    impl ICS20TransferreableInternalImpl =
+    impl TokenTransferreableInternalImpl =
         TransferrableComponent::TransferrableInternalImpl<ContractState>;
     #[abi(embed_v0)]
-    impl ICS20SendTransferImpl =
-        ICS20TransferComponent::SendTransfer<ContractState>;
+    impl TokenSendTransferImpl =
+        TokenTransferComponent::SendTransfer<ContractState>;
     #[abi(embed_v0)]
-    impl ICS20RecvPacketImpl = ICS20TransferComponent::RecvPacket<ContractState>;
+    impl TokenRecvPacketImpl = TokenTransferComponent::RecvPacket<ContractState>;
     #[abi(embed_v0)]
-    impl ICS20TokenAddressImpl =
-        ICS20TransferComponent::IBCTokenAddress<ContractState>;
-    impl TransferValidationImpl = ICS20TransferComponent::TransferValidationImpl<ContractState>;
-    impl TransferExecutionImpl = ICS20TransferComponent::TransferExecutionImpl<ContractState>;
-    impl TransferInternalImpl = ICS20TransferComponent::TransferInternalImpl<ContractState>;
+    impl TokenTokenAddressImpl =
+        TokenTransferComponent::IBCTokenAddress<ContractState>;
+    impl TransferValidationImpl = TokenTransferComponent::TransferValidationImpl<ContractState>;
+    impl TransferExecutionImpl = TokenTransferComponent::TransferExecutionImpl<ContractState>;
+    impl TransferInternalImpl = TokenTransferComponent::TransferInternalImpl<ContractState>;
 
     #[storage]
     struct Storage {
         #[substorage(v0)]
         transferrable: TransferrableComponent::Storage,
         #[substorage(v0)]
-        transfer: ICS20TransferComponent::Storage,
+        transfer: TokenTransferComponent::Storage,
     }
 
     #[event]
@@ -47,7 +47,7 @@ pub(crate) mod MockTransferApp {
         #[flat]
         TransferrableEvent: TransferrableComponent::Event,
         #[flat]
-        ICS20TransferEvent: ICS20TransferComponent::Event,
+        TokenTransferEvent: TokenTransferComponent::Event,
     }
 
     #[constructor]

diff --git a/cairo-contracts/core/src/client/components/handler.cairo b/cairo-contracts/core/src/client/components/handler.cairo
@@ -31,12 +31,12 @@ pub mod ClientHandlerComponent {
     }
 
     #[generate_trait]
-    pub impl ICS02ClientImpl<
+    pub impl CoreClientImpl<
         TContractState,
         +HasComponent<TContractState>,
         +Drop<TContractState>,
         impl EventEmitter: ClientEventEmitterComponent::HasComponent<TContractState>
-    > of ICS02ClientTrait<TContractState> {
+    > of CoreClientTrait<TContractState> {
         fn create_client(ref self: ComponentState<TContractState>, msg: MsgCreateClient) {
             let mut client = self.get_client(msg.client_type);