From d8d52012acc85e3b60d0bd9c8dd84da428efb8ca Mon Sep 17 00:00:00 2001 From: Farhad Shabani Date: Sun, 1 Sep 2024 22:16:32 -0700 Subject: [PATCH] chore: move away from ICS codes in types --- .../apps/src/tests/setup/transfer.cairo | 2 +- .../apps/src/transfer/components.cairo | 2 +- .../src/transfer/components/transfer.cairo | 2 +- .../contracts/src/apps/transfer.cairo | 28 +++++++++---------- .../src/tests/mocks/transfer_mock.cairo | 28 +++++++++---------- .../core/src/client/components/handler.cairo | 4 +-- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cairo-contracts/apps/src/tests/setup/transfer.cairo b/cairo-contracts/apps/src/tests/setup/transfer.cairo index 221fcbe4..0187d896 100644 --- 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 index 3536353a..9231b929 100644 --- 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 index 5ff6b343..a6ef41fa 100644 --- 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 index faab92e5..ad5b1ce3 100644 --- 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; impl IBCGovernanceInternalImpl = IBCGovernanceComponent::GovernanceInternalImpl; #[abi(embed_v0)] - impl ICS20TransferreableImpl = + impl TokenTransferreableImpl = TransferrableComponent::Transferrable; - impl ICS20TransferreableInternal = + impl TokenTransferreableInternal = TransferrableComponent::TransferrableInternalImpl; #[abi(embed_v0)] - impl ICS20SendTransferImpl = - ICS20TransferComponent::SendTransfer; + impl TokenSendTransferImpl = + TokenTransferComponent::SendTransfer; #[abi(embed_v0)] - impl ICS20RecvPacketImpl = ICS20TransferComponent::RecvPacket; + impl TokenRecvPacketImpl = TokenTransferComponent::RecvPacket; #[abi(embed_v0)] - impl ICS20TokenAddressImpl = - ICS20TransferComponent::IBCTokenAddress; - impl TransferValidationImpl = ICS20TransferComponent::TransferValidationImpl; - impl TransferExecutionImpl = ICS20TransferComponent::TransferExecutionImpl; - impl TransferInternalImpl = ICS20TransferComponent::TransferInternalImpl; + impl TokenTokenAddressImpl = + TokenTransferComponent::IBCTokenAddress; + impl TransferValidationImpl = TokenTransferComponent::TransferValidationImpl; + impl TransferExecutionImpl = TokenTransferComponent::TransferExecutionImpl; + impl TransferInternalImpl = TokenTransferComponent::TransferInternalImpl; #[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 index 16614827..2a646a26 100644 --- 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; - impl ICS20TransferreableInternalImpl = + impl TokenTransferreableInternalImpl = TransferrableComponent::TransferrableInternalImpl; #[abi(embed_v0)] - impl ICS20SendTransferImpl = - ICS20TransferComponent::SendTransfer; + impl TokenSendTransferImpl = + TokenTransferComponent::SendTransfer; #[abi(embed_v0)] - impl ICS20RecvPacketImpl = ICS20TransferComponent::RecvPacket; + impl TokenRecvPacketImpl = TokenTransferComponent::RecvPacket; #[abi(embed_v0)] - impl ICS20TokenAddressImpl = - ICS20TransferComponent::IBCTokenAddress; - impl TransferValidationImpl = ICS20TransferComponent::TransferValidationImpl; - impl TransferExecutionImpl = ICS20TransferComponent::TransferExecutionImpl; - impl TransferInternalImpl = ICS20TransferComponent::TransferInternalImpl; + impl TokenTokenAddressImpl = + TokenTransferComponent::IBCTokenAddress; + impl TransferValidationImpl = TokenTransferComponent::TransferValidationImpl; + impl TransferExecutionImpl = TokenTransferComponent::TransferExecutionImpl; + impl TransferInternalImpl = TokenTransferComponent::TransferInternalImpl; #[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 index e6e61e70..9c53ea2f 100644 --- 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, +Drop, impl EventEmitter: ClientEventEmitterComponent::HasComponent - > of ICS02ClientTrait { + > of CoreClientTrait { fn create_client(ref self: ComponentState, msg: MsgCreateClient) { let mut client = self.get_client(msg.client_type);