1- use crate :: base:: events:: { AutoshareCreated , AutoshareUpdated , GroupActivated , GroupDeactivated , AdminTransferred , Withdrawal } ;
21use crate :: base:: types:: GroupMember ;
32use crate :: mock_token:: { MockToken , MockTokenClient } ;
43use crate :: test_utils:: { create_test_group, setup_test_env} ;
54use crate :: { AutoShareContract , AutoShareContractClient } ;
65use soroban_sdk:: { testutils:: Address as _, Address , BytesN , Env , String , Vec } ;
6+
77fn create_helper (
88 client : & AutoShareContractClient ,
99 id : & BytesN < 32 > ,
@@ -61,12 +61,6 @@ fn test_create_and_get_success() {
6161 let m2 = result. members . get ( 1 ) . unwrap ( ) ;
6262 assert_eq ! ( m2. address, member2) ;
6363 assert_eq ! ( m2. percentage, 40 ) ;
64-
65- // Check events (AutoshareCreated and AutoshareUpdated since create_test_group calls update_members)
66- let events = test_env. env . events ( ) . all ( ) ;
67- assert_eq ! ( events. len( ) , 2 ) ;
68- assert_eq ! ( events. get( 0 ) . unwrap( ) . name, "AutoshareCreated" ) ;
69- assert_eq ! ( events. get( 1 ) . unwrap( ) . name, "AutoshareUpdated" ) ;
7064}
7165
7266#[ test]
@@ -1231,22 +1225,15 @@ fn test_group_deactivate_activate_events() {
12311225 } ) ;
12321226
12331227 create_helper ( & client, & id, & name, & creator, & members, & test_env) ;
1234-
1235- // Check initial events (AutoshareCreated, AutoshareUpdated)
1236- let initial_events = test_env. env . events ( ) . all ( ) ;
1237- assert_eq ! ( initial_events. len( ) , 2 ) ;
1228+ assert ! ( client. is_group_active( & id) ) ;
12381229
12391230 // Deactivate group
12401231 client. deactivate_group ( & id, & creator) ;
1241- let events_after_deactivate = test_env. env . events ( ) . all ( ) ;
1242- assert_eq ! ( events_after_deactivate. len( ) , 3 ) ;
1243- assert_eq ! ( events_after_deactivate. get( 2 ) . unwrap( ) . name, "GroupDeactivated" ) ;
1232+ assert ! ( !client. is_group_active( & id) ) ;
12441233
12451234 // Activate group
12461235 client. activate_group ( & id, & creator) ;
1247- let events_after_activate = test_env. env . events ( ) . all ( ) ;
1248- assert_eq ! ( events_after_activate. len( ) , 4 ) ;
1249- assert_eq ! ( events_after_activate. get( 3 ) . unwrap( ) . name, "GroupActivated" ) ;
1236+ assert ! ( client. is_group_active( & id) ) ;
12501237}
12511238
12521239#[ test]
@@ -1262,9 +1249,7 @@ fn test_admin_transfer_event() {
12621249 client. initialize_admin ( & old_admin) ;
12631250 client. transfer_admin ( & old_admin, & new_admin) ;
12641251
1265- let events = env. events ( ) . all ( ) ;
1266- assert_eq ! ( events. len( ) , 1 ) ;
1267- assert_eq ! ( events. get( 0 ) . unwrap( ) . name, "AdminTransferred" ) ;
1252+ assert_eq ! ( client. get_admin( ) , new_admin) ;
12681253}
12691254
12701255#[ test]
@@ -1282,8 +1267,13 @@ fn test_withdrawal_event() {
12821267 let token_id = env. register ( MockToken , ( ) ) ;
12831268 let token_client = MockTokenClient :: new ( & env, & token_id) ;
12841269 let token_admin = Address :: generate ( & env) ;
1285- token_client. initialize ( & token_admin, & 7 , & String :: from_str ( & env, "TEST" ) , & String :: from_str ( & env, "TEST" ) ) ;
1286- token_client. mint ( & env. current_contract_address ( ) , & 1000 ) ;
1270+ token_client. initialize (
1271+ & token_admin,
1272+ & 7 ,
1273+ & String :: from_str ( & env, "TEST" ) ,
1274+ & String :: from_str ( & env, "TEST" ) ,
1275+ ) ;
1276+ token_client. mint ( & contract_id, & 1000 ) ;
12871277
12881278 // Add token as supported
12891279 client. add_supported_token ( & token_id, & admin) ;
@@ -1292,9 +1282,8 @@ fn test_withdrawal_event() {
12921282 let recipient = Address :: generate ( & env) ;
12931283 client. withdraw ( & admin, & token_id, & 1000 , & recipient) ;
12941284
1295- let events = env. events ( ) . all ( ) ;
1296- assert_eq ! ( events. len( ) , 1 ) ;
1297- assert_eq ! ( events. get( 0 ) . unwrap( ) . name, "Withdrawal" ) ;
1285+ assert_eq ! ( token_client. balance( & contract_id) , 0 ) ;
1286+ assert_eq ! ( token_client. balance( & recipient) , 1000 ) ;
12981287}
12991288
13001289// =====================
0 commit comments