@layerzerolabs/protocol-stellar-v2 0.2.20 → 0.2.21

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_default_receive_library.rs

@@ -2,7 +2,7 @@ use soroban_sdk::{
     testutils::{Address as _, Ledger},
     vec, Address,
 };
-use utils::testing_utils::assert_event;
+use utils::testing_utils::{assert_contains_event, assert_contains_events};
 
 use crate::{
     errors::EndpointError,
@@ -94,12 +94,14 @@ fn test_set_default_receive_library_success() {
     context.set_default_receive_library_with_auth(context.eid, &receive_lib, 0);
 
     // Verify event emission.
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: receive_lib.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: receive_lib.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None },
+        ],
     );
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None });
 
     // Verify state update via public interface.
     assert_eq!(endpoint_client.default_receive_library(&context.eid), Some(receive_lib.clone()));
@@ -137,15 +139,13 @@ fn test_set_default_receive_library_success_with_grace_period() {
     let expected_timeout = Some(Timeout { lib: receive_lib.clone(), expiry: current_timestamp + grace_period });
 
     // Verify event emission (from the second call).
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: new_receive_lib.clone() },
-    );
-    assert_event(
-        env,
-        &endpoint_client.address,
-        DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: expected_timeout.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: new_receive_lib.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: expected_timeout.clone() },
+        ],
     );
 
     // Verify state update via public interface.
@@ -170,12 +170,14 @@ fn test_set_default_receive_library_grace_period_with_no_previous_default_sets_n
     context.set_default_receive_library_with_auth(context.eid, &receive_lib, grace_period);
 
     // Timeout must be None because there was no previous default to keep alive.
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: receive_lib.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: receive_lib.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None },
+        ],
     );
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None });
 
     assert_eq!(endpoint_client.default_receive_library(&context.eid), Some(receive_lib));
     assert_eq!(endpoint_client.default_receive_library_timeout(&context.eid), None);
@@ -206,23 +208,31 @@ fn test_set_default_receive_library_grace_period_zero_clears_timeout() {
 
     // A: initial set (no timeout).
     context.set_default_receive_library_with_auth(src_eid, &lib_a, 0);
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_a.clone() });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid, timeout: None });
+    assert_contains_events(
+        env,
+        &endpoint_client.address,
+        &[
+            &DefaultReceiveLibrarySet { src_eid, new_lib: lib_a.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid, timeout: None },
+        ],
+    );
 
     // B: rotate with grace -> timeout for A must be set.
     context.set_default_receive_library_with_auth(src_eid, &lib_b, grace_period);
     let expected_timeout_b = Some(Timeout { lib: lib_a.clone(), expiry: current_timestamp + grace_period });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_b.clone() });
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_b.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid, new_lib: lib_b.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_b.clone() },
+        ],
     );
 
     // C: rotate with grace=0 -> timeout must be cleared (None).
     context.set_default_receive_library_with_auth(src_eid, &lib_c, 0);
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_c.clone() });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid, timeout: None });
+    assert_contains_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_c.clone() });
+    assert_contains_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid, timeout: None });
 
     assert_eq!(endpoint_client.default_receive_library(&src_eid), Some(lib_c));
     assert_eq!(endpoint_client.default_receive_library_timeout(&src_eid), None);
@@ -252,14 +262,26 @@ fn test_set_default_receive_library_multi_rotation_timeout_uses_immediate_previo
 
     // A initial.
     context.set_default_receive_library_with_auth(src_eid, &lib_a, 0);
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_a.clone() });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid, timeout: None });
+    assert_contains_events(
+        env,
+        &endpoint_client.address,
+        &[
+            &DefaultReceiveLibrarySet { src_eid, new_lib: lib_a.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid, timeout: None },
+        ],
+    );
 
     // Rotate A -> B with grace=1000 => keep A.
     context.set_default_receive_library_with_auth(src_eid, &lib_b, 1_000);
     let expected_timeout_b = Some(Timeout { lib: lib_a.clone(), expiry: t0 + 1_000 });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_b.clone() });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_b });
+    assert_contains_events(
+        env,
+        &endpoint_client.address,
+        &[
+            &DefaultReceiveLibrarySet { src_eid, new_lib: lib_b.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_b },
+        ],
+    );
 
     // Advance time, then rotate B -> C with grace=500 => must keep B (not A).
     let t1 = t0 + 10;
@@ -268,11 +290,13 @@ fn test_set_default_receive_library_multi_rotation_timeout_uses_immediate_previo
     });
     context.set_default_receive_library_with_auth(src_eid, &lib_c, 500);
     let expected_timeout_c = Some(Timeout { lib: lib_b.clone(), expiry: t1 + 500 });
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibrarySet { src_eid, new_lib: lib_c.clone() });
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_c.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid, new_lib: lib_c.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid, timeout: expected_timeout_c.clone() },
+        ],
     );
 
     assert_eq!(endpoint_client.default_receive_library(&src_eid), Some(lib_c));
@@ -296,20 +320,24 @@ fn test_set_default_receive_library_is_scoped_by_src_eid() {
     context.register_library_with_auth(&lib_2);
 
     context.set_default_receive_library_with_auth(src_eid_1, &lib_1, 0);
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: src_eid_1, new_lib: lib_1.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: src_eid_1, new_lib: lib_1.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: src_eid_1, timeout: None },
+        ],
     );
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: src_eid_1, timeout: None });
 
     context.set_default_receive_library_with_auth(src_eid_2, &lib_2, 0);
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: src_eid_2, new_lib: lib_2.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: src_eid_2, new_lib: lib_2.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: src_eid_2, timeout: None },
+        ],
     );
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: src_eid_2, timeout: None });
 
     assert_eq!(endpoint_client.default_receive_library(&src_eid_1), Some(lib_1));
     assert_eq!(endpoint_client.default_receive_library_timeout(&src_eid_1), None);
@@ -372,12 +400,14 @@ fn test_set_default_receive_library_with_send_and_receive_type() {
     context.set_default_receive_library_with_auth(context.eid, &send_and_receive_lib, 0);
 
     // Verify event emission.
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: send_and_receive_lib.clone() },
+        &[
+            &DefaultReceiveLibrarySet { src_eid: context.eid, new_lib: send_and_receive_lib.clone() },
+            &DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None },
+        ],
     );
-    assert_event(env, &endpoint_client.address, DefaultReceiveLibTimeoutSet { src_eid: context.eid, timeout: None });
 
     // Verify state update via public interface.
     assert_eq!(endpoint_client.default_receive_library(&context.eid), Some(send_and_receive_lib));

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_default_send_library.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, vec, Address};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     errors::EndpointError, events::DefaultSendLibrarySet, tests::endpoint_setup::setup,
@@ -79,7 +79,7 @@ fn test_set_default_send_library_success() {
     context.set_default_send_library_with_auth(context.eid, &send_lib);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         DefaultSendLibrarySet { dst_eid: context.eid, new_lib: send_lib.clone() },
@@ -105,7 +105,7 @@ fn test_set_default_send_library_success_with_send_and_receive_type() {
     context.set_default_send_library_with_auth(context.eid, &send_and_receive_lib);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         DefaultSendLibrarySet { dst_eid: context.eid, new_lib: send_and_receive_lib.clone() },
@@ -130,7 +130,7 @@ fn test_set_default_send_library_can_change_default_library() {
 
     // Set A as the default first.
     context.set_default_send_library_with_auth(context.eid, &send_lib_a);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         DefaultSendLibrarySet { dst_eid: context.eid, new_lib: send_lib_a.clone() },
@@ -139,7 +139,7 @@ fn test_set_default_send_library_can_change_default_library() {
 
     // Then change the default to B.
     context.set_default_send_library_with_auth(context.eid, &send_lib_b);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         DefaultSendLibrarySet { dst_eid: context.eid, new_lib: send_lib_b.clone() },

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_receive_library.rs

@@ -2,7 +2,7 @@ use soroban_sdk::{
     testutils::{Address as _, Ledger},
     vec, Address,
 };
-use utils::testing_utils::assert_event;
+use utils::testing_utils::{assert_contains_event, assert_contains_events};
 
 use crate::{
     errors::EndpointError,
@@ -73,15 +73,13 @@ fn test_set_receive_library_allows_delegate() {
     context.set_receive_library_with_auth(&delegate, &oapp, context.eid, &Some(receive_lib.clone()), 0);
 
     // Verify event emission.
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib.clone()) },
-    );
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib.clone()) },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        ],
     );
 
     // Verify state update via public interface.
@@ -166,15 +164,13 @@ fn test_set_receive_library_success() {
     context.set_receive_library_with_auth(&oapp, &oapp, context.eid, &Some(receive_lib.clone()), 0);
 
     // Verify event emission.
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib.clone()) },
-    );
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib.clone()) },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        ],
     );
 
     // Verify state update via public interface.
@@ -202,15 +198,17 @@ fn test_set_receive_library_success_with_send_and_receive_type() {
     context.set_receive_library_with_auth(&oapp, &oapp, context.eid, &Some(send_and_receive_lib.clone()), 0);
 
     // Verify event emission.
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(send_and_receive_lib.clone()) },
-    );
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        &[
+            &ReceiveLibrarySet {
+                receiver: oapp.clone(),
+                src_eid: context.eid,
+                new_lib: Some(send_and_receive_lib.clone()),
+            },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        ],
     );
 
     assert_eq!(
@@ -251,15 +249,13 @@ fn test_set_receive_library_success_with_grace_period() {
     let expected_timeout = Some(Timeout { lib: old_receive_lib.clone(), expiry: current_timestamp + grace_period });
 
     // Verify event emission (from the second call).
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(new_receive_lib.clone()) },
-    );
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: expected_timeout.clone() },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(new_receive_lib.clone()) },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: expected_timeout.clone() },
+        ],
     );
 
     // Verify state update via public interface.
@@ -352,41 +348,37 @@ fn test_set_receive_library_grace_period_zero_clears_timeout() {
 
     // A: initial set (no timeout).
     context.set_receive_library_with_auth(&oapp, &oapp, src_eid, &Some(lib_a.clone()), 0);
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid, new_lib: Some(lib_a.clone()) },
-    );
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: None },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid, new_lib: Some(lib_a.clone()) },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: None },
+        ],
     );
 
     // B: rotate with grace -> timeout for A must be set.
     let grace_period = 1_000u64;
     context.set_receive_library_with_auth(&oapp, &oapp, src_eid, &Some(lib_b.clone()), grace_period);
     let expected_timeout_b = Some(Timeout { lib: lib_a.clone(), expiry: t0 + grace_period });
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid, new_lib: Some(lib_b.clone()) },
-    );
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: expected_timeout_b.clone() },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid, new_lib: Some(lib_b.clone()) },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: expected_timeout_b.clone() },
+        ],
     );
     assert_eq!(endpoint_client.receive_library_timeout(&oapp, &src_eid), expected_timeout_b.clone());
 
     // C: rotate with grace=0 -> timeout must be cleared (None).
     context.set_receive_library_with_auth(&oapp, &oapp, src_eid, &Some(lib_c.clone()), 0);
-    assert_event(
+    assert_contains_event(
         env,
         &endpoint_client.address,
         ReceiveLibrarySet { receiver: oapp.clone(), src_eid, new_lib: Some(lib_c.clone()) },
     );
-    assert_event(
+    assert_contains_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: None },
@@ -417,15 +409,13 @@ fn test_set_receive_library_clear_to_none() {
     context.set_receive_library_with_auth(&oapp, &oapp, context.eid, &None, 0);
 
     // Verify event emission.
-    assert_event(
-        env,
-        &endpoint_client.address,
-        ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: None },
-    );
-    assert_event(
+    assert_contains_events(
         env,
         &endpoint_client.address,
-        ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        &[
+            &ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: None },
+            &ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: context.eid, timeout: None },
+        ],
     );
 
     // Verify state update via public interface (should fall back to default).
@@ -452,7 +442,7 @@ fn test_set_receive_library_can_change_library() {
 
     // Set A first.
     context.set_receive_library_with_auth(&oapp, &oapp, context.eid, &Some(receive_lib_a.clone()), 0);
-    assert_event(
+    assert_contains_event(
         env,
         &endpoint_client.address,
         ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib_a.clone()) },
@@ -464,7 +454,7 @@ fn test_set_receive_library_can_change_library() {
 
     // Then change to B.
     context.set_receive_library_with_auth(&oapp, &oapp, context.eid, &Some(receive_lib_b.clone()), 0);
-    assert_event(
+    assert_contains_event(
         env,
         &endpoint_client.address,
         ReceiveLibrarySet { receiver: oapp.clone(), src_eid: context.eid, new_lib: Some(receive_lib_b.clone()) },

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_receive_library_timeout.rs

@@ -2,7 +2,7 @@ use soroban_sdk::{
     testutils::{Address as _, Ledger},
     vec, Address,
 };
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     errors::EndpointError, events::ReceiveLibraryTimeoutSet, tests::endpoint_setup::setup,
@@ -230,7 +230,7 @@ fn test_set_receive_library_timeout_success() {
     set_receive_library_timeout_with_auth(&context, &oapp, &oapp, src_eid, &timeout);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: timeout.clone() },
@@ -268,7 +268,7 @@ fn test_set_receive_library_timeout_success_with_send_and_receive_type() {
     set_receive_library_timeout_with_auth(&context, &oapp, &oapp, src_eid, &timeout);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: timeout.clone() },
@@ -305,7 +305,7 @@ fn test_set_receive_library_timeout_allows_delegate() {
     set_receive_library_timeout_with_auth(&context, &delegate, &oapp, src_eid, &timeout);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: timeout.clone() },
@@ -377,7 +377,7 @@ fn test_set_receive_library_timeout_success_with_none() {
     set_receive_library_timeout_with_auth(&context, &oapp, &oapp, src_eid, &None);
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: None },
@@ -408,7 +408,7 @@ fn test_set_receive_library_timeout_clears_existing_timeout() {
     // First set a timeout.
     let timeout = Some(Timeout { lib: receive_lib.clone(), expiry: current_timestamp + 1000 });
     set_receive_library_timeout_with_auth(&context, &oapp, &oapp, src_eid, &timeout);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: timeout.clone() },
@@ -417,7 +417,7 @@ fn test_set_receive_library_timeout_clears_existing_timeout() {
 
     // Then clear it.
     set_receive_library_timeout_with_auth(&context, &oapp, &oapp, src_eid, &None);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ReceiveLibraryTimeoutSet { receiver: oapp.clone(), eid: src_eid, timeout: None },

package/contracts/endpoint-v2/src/tests/message_lib_manager/set_send_library.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, vec, Address};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     errors::EndpointError, events::SendLibrarySet, storage, tests::endpoint_setup::setup,
@@ -65,7 +65,7 @@ fn test_set_send_library_allows_delegate() {
     context.set_send_library_with_auth(&delegate, &oapp, context.eid, &Some(send_lib.clone()));
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(send_lib.clone()) },
@@ -148,7 +148,7 @@ fn test_set_send_library_success() {
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &Some(send_lib.clone()));
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(send_lib.clone()) },
@@ -177,7 +177,7 @@ fn test_set_send_library_success_with_send_and_receive_type() {
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &Some(send_and_receive_lib.clone()));
 
     // Verify event emission.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(send_and_receive_lib.clone()) },
@@ -206,7 +206,7 @@ fn test_set_send_library_can_change_library() {
 
     // Set A first.
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &Some(send_lib_a.clone()));
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(send_lib_a.clone()) },
@@ -218,7 +218,7 @@ fn test_set_send_library_can_change_library() {
 
     // Then change to B.
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &Some(send_lib_b.clone()));
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(send_lib_b.clone()) },
@@ -277,7 +277,7 @@ fn test_set_send_library_clear_to_none_falls_back_to_default() {
 
     // Set a custom library.
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &Some(custom_send_lib.clone()));
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: Some(custom_send_lib.clone()) },
@@ -289,7 +289,7 @@ fn test_set_send_library_clear_to_none_falls_back_to_default() {
 
     // Then clear to None (should fall back to default).
     context.set_send_library_with_auth(&oapp, &oapp, context.eid, &None);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         SendLibrarySet { sender: oapp.clone(), dst_eid: context.eid, new_lib: None },

package/contracts/endpoint-v2/src/tests/messaging_channel/burn.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, Address, BytesN};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     errors::EndpointError,
@@ -95,7 +95,7 @@ fn test_burn_success_with_stored_payload() {
     burn_with_auth(&context, &receiver, &receiver, src_eid, &sender, nonce, &payload_hash);
 
     // Verify PacketBurnt event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         PacketBurnt {
@@ -138,7 +138,7 @@ fn test_burn_with_delegate() {
     burn_with_auth(&context, &delegate, &receiver, src_eid, &sender, nonce, &payload_hash);
 
     // Verify PacketBurnt event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         PacketBurnt {

package/contracts/endpoint-v2/src/tests/messaging_channel/nilify.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, Address, BytesN};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     endpoint_v2::EndpointV2, errors::EndpointError, events::PacketNilified, storage, tests::endpoint_setup::setup,
@@ -98,7 +98,7 @@ fn test_nilify_success_with_stored_payload() {
     nilify_with_auth(&context, &receiver, &receiver, src_eid, &sender, nonce, &payload_hash_opt);
 
     // Verify PacketNilified event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         PacketNilified {
@@ -137,7 +137,7 @@ fn test_nilify_success_with_empty_payload() {
     nilify_with_auth(&context, &receiver, &receiver, src_eid, &sender, nonce, &None);
 
     // Verify PacketNilified event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         PacketNilified { src_eid, sender: sender.clone(), receiver: receiver.clone(), nonce, payload_hash: None },
@@ -255,7 +255,7 @@ fn test_nilify_with_delegate() {
     nilify_with_auth(&context, &delegate, &receiver, src_eid, &sender, nonce, &payload_hash_opt);
 
     // Verify PacketNilified event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         PacketNilified {

package/contracts/endpoint-v2/src/tests/messaging_channel/skip.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, Address, BytesN};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     errors::EndpointError, events::InboundNonceSkipped, storage, tests::endpoint_setup::setup,
@@ -77,7 +77,7 @@ fn test_skip_success() {
     skip_with_auth(&context, &receiver, &receiver, src_eid, &sender, nonce);
 
     // Verify InboundNonceSkipped event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         InboundNonceSkipped { src_eid, sender: sender.clone(), receiver: receiver.clone(), nonce },
@@ -140,7 +140,7 @@ fn test_skip_with_delegate() {
     skip_with_auth(&context, &delegate, &receiver, src_eid, &sender, nonce);
 
     // Verify InboundNonceSkipped event was emitted.
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         InboundNonceSkipped { src_eid, sender: sender.clone(), receiver: receiver.clone(), nonce },

package/contracts/endpoint-v2/src/tests/messaging_composer/clear_compose.rs

@@ -1,5 +1,5 @@
 use soroban_sdk::{testutils::Address as _, Address, Bytes, BytesN};
-use utils::testing_utils::assert_event;
+use utils::testing_utils::assert_eq_event;
 
 use crate::{
     constants::{MAX_COMPOSE_INDEX, RECEIVED_MESSAGE_HASH_BYTES},
@@ -90,7 +90,7 @@ fn test_clear_compose_success() {
     assert_eq!(endpoint_client.compose_queue(&from, &composer, &guid, &index), Some(keccak256(env, &message)));
 
     clear_compose_with_auth(&context, &composer, &from, &guid, index, &message);
-    assert_event(
+    assert_eq_event(
         env,
         &endpoint_client.address,
         ComposeDelivered { from: from.clone(), to: composer.clone(), guid: guid.clone(), index },