create CALLER test constant

chachaleo · Aug 26, 2024 · 2986ab6 · 2986ab6
1 parent dbec2a4
commit 2986ab6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/contracts/src/components/registry/registry_test.cairo b/contracts/src/components/registry/registry_test.cairo
@@ -22,23 +22,21 @@ use zkramp::tests::utils;
 fn test_is_registered() {
     let test_address: ContractAddress = test_address();
 
-    start_cheat_caller_address(test_address, contract_address_const::<'caller'>());
+    start_cheat_caller_address(test_address, constants::CALLER());
 
     let mut registry: ComponentState = Default::default();
 
     registry.register(offchain_id: constants::REVOLUT_ID());
 
-    assert_eq!(
-        registry.is_registered(contract_address_const::<'caller'>(), constants::REVOLUT_ID()), true
-    );
+    assert_eq!(registry.is_registered(constants::CALLER(), constants::REVOLUT_ID()), true);
 }
 
 #[test]
 fn test_registration_event() {
     let test_address: ContractAddress = test_address();
     let mut spy = spy_events();
 
-    start_cheat_caller_address(test_address, contract_address_const::<'caller'>());
+    start_cheat_caller_address(test_address, constants::CALLER());
 
     let mut registry: ComponentState = Default::default();
 
@@ -51,8 +49,7 @@ fn test_registration_event() {
                     test_address,
                     Event::RegistrationEvent(
                         RegistrationEvent {
-                            caller: contract_address_const::<'caller'>(),
-                            offchain_id: constants::REVOLUT_ID()
+                            caller: constants::CALLER(), offchain_id: constants::REVOLUT_ID()
                         }
                     )
                 )
@@ -67,4 +64,3 @@ fn test_register_from_zero() {
 
     registry.register(offchain_id: constants::REVOLUT_ID());
 }
-
diff --git a/contracts/src/tests/constants.cairo b/contracts/src/tests/constants.cairo
@@ -1,3 +1,4 @@
+use core::starknet::{ContractAddress, contract_address_const};
 use zkramp::components::registry::interface::OffchainId;
 
 pub fn REVTAG() -> ByteArray {
@@ -7,3 +8,7 @@ pub fn REVTAG() -> ByteArray {
 pub fn REVOLUT_ID() -> OffchainId {
     OffchainId::Revolut(REVTAG())
 }
+
+pub fn CALLER() -> ContractAddress {
+    contract_address_const::<'caller'>()
+}