From a0e893513d9775991bfb18c086f7985d0108ef92 Mon Sep 17 00:00:00 2001
From: Mohammad Nassar <mohammad@starkware.co>
Date: Thu, 28 Aug 2025 15:10:31 +0300
Subject: [PATCH] chore(payments): cosmetic changes

---
 src/events.cairo              |  3 ++-
 src/payments.cairo            | 12 ++++++++----
 src/tests/test_payments.cairo | 14 --------------
 src/tests/test_utils.cairo    | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/events.cairo b/src/events.cairo
index 0a772d0..b63a8b9 100644
--- a/src/events.cairo
+++ b/src/events.cairo
@@ -1,4 +1,5 @@
 use starknet::ContractAddress;
+use starkware_utils::signature::stark::HashType;
 
 #[derive(Debug, Drop, PartialEq, starknet::Event)]
 pub struct FeeSet {
@@ -44,5 +45,5 @@ pub struct OrderCanceled {
     #[key]
     pub user: ContractAddress,
     #[key]
-    pub hash: felt252,
+    pub hash: HashType,
 }
diff --git a/src/payments.cairo b/src/payments.cairo
index 00db7ce..c1bfcf5 100644
--- a/src/payments.cairo
+++ b/src/payments.cairo
@@ -269,6 +269,7 @@ pub mod payments {
             // Emit an event.
             self.emit(TokenRegistered { token });
         }
+
         fn remove_token(ref self: ContractState, token: ContractAddress) {
             self.roles.only_app_governor();
 
@@ -278,10 +279,6 @@ pub mod payments {
             // Emit an event.
             self.emit(TokenRemoved { token });
         }
-        fn is_token_registered(self: @ContractState, token: ContractAddress) -> bool {
-            assert(token.is_non_zero(), INVALID_ZERO_TOKEN);
-            self.tokens.read(token)
-        }
 
         fn cancel_orders(ref self: ContractState, orders: Span<Order>) {
             self.roles.only_operator();
@@ -309,13 +306,20 @@ pub mod payments {
         fn get_fee_limit(self: @ContractState) -> u128 {
             self.fee_limit.read()
         }
+
         fn get_fee(self: @ContractState) -> u128 {
             self.fee.read()
         }
+
         fn get_fee_recipient(self: @ContractState) -> ContractAddress {
             self.fee_recipient.read()
         }
 
+        fn is_token_registered(self: @ContractState, token: ContractAddress) -> bool {
+            assert(token.is_non_zero(), INVALID_ZERO_TOKEN);
+            self.tokens.read(token)
+        }
+
         fn get_order_fulfillment(self: @ContractState, order_hash: HashType) -> u128 {
             self.fulfillment.read(order_hash)
         }
diff --git a/src/tests/test_payments.cairo b/src/tests/test_payments.cairo
index 13463ac..11d1df2 100644
--- a/src/tests/test_payments.cairo
+++ b/src/tests/test_payments.cairo
@@ -9,7 +9,6 @@ use starknet_payments::interface::{
     IPaymentsSafeDispatcherTrait,
 };
 use starkware_utils::signature::stark::HashType;
-use starkware_utils::time::time::Timestamp;
 use starkware_utils_testing::constants as testing_constants;
 use starkware_utils_testing::test_utils::{
     assert_expected_event_emitted, assert_panic_with_error, assert_panic_with_felt_error,
@@ -20,19 +19,6 @@ use crate::order::Order;
 use crate::payments::payments::SNIP12MetadataImpl;
 use crate::tests::test_utils::*;
 
-fn default_order() -> Order {
-    Order {
-        salt: 0,
-        expiry: Timestamp { seconds: 0 },
-        user: testing_constants::DUMMY_ADDRESS,
-        sell_token: testing_constants::DUMMY_ADDRESS,
-        buy_token: testing_constants::DUMMY_ADDRESS,
-        sell_amount: 100,
-        buy_amount: 200,
-        approved_counterparties: array![].span(),
-    }
-}
-
 #[test]
 fn test_successful_register_token() {
     let contract_address = init_contract_with_roles();
diff --git a/src/tests/test_utils.cairo b/src/tests/test_utils.cairo
index 392369a..f84d29c 100644
--- a/src/tests/test_utils.cairo
+++ b/src/tests/test_utils.cairo
@@ -4,7 +4,9 @@ use snforge_std::signature::stark_curve::{StarkCurveKeyPairImpl, StarkCurveSigne
 use snforge_std::signature::{KeyPair, KeyPairTrait};
 use snforge_std::{Token, TokenImpl, TokenTrait, set_balance};
 use starknet::ContractAddress;
+use starkware_utils::time::time::Timestamp;
 use starkware_utils_testing::{constants as testing_constants, test_utils};
+use crate::order::Order;
 use crate::payments::payments::SNIP12MetadataImpl;
 
 pub mod constants {
@@ -62,3 +64,16 @@ pub fn test_setup() -> (
 
     (contract_address, token_a, token_b, user_a, user_b, key_pair_a, key_pair_b)
 }
+
+pub fn default_order() -> Order {
+    Order {
+        salt: 0,
+        expiry: Timestamp { seconds: 0 },
+        user: testing_constants::DUMMY_ADDRESS,
+        sell_token: testing_constants::DUMMY_ADDRESS,
+        buy_token: testing_constants::DUMMY_ADDRESS,
+        sell_amount: 100,
+        buy_amount: 200,
+        approved_counterparties: array![].span(),
+    }
+}