simplify the test

Author: Stevengre

kmir/src/tests/integration/data/prove-rs/spl_token_domain_data.rs

@@ -133,30 +133,21 @@ fn test_spltoken_domain_data(
     multisig: &AccountInfo<'_>,
     rent: &AccountInfo<'_>,
 ) {
-    test_spl_account_pack_is_native_branch(acc);
-    test_spl_account_is_native_branch(acc);
+    test_spl_account_is_native_branches(acc);
     test_spl_account_domain_data(acc);
     test_spl_mint_domain_data(mint);
     test_spl_multisig_domain_data(multisig);
     test_spl_rent_domain_data(rent);
 }
 
-fn test_spl_account_pack_is_native_branch(acc: &AccountInfo<'_>) {
-    // Keep is_native symbolic and pack through an extra call frame to mirror process_burn’s cross-frame writeback
+fn test_spl_account_is_native_branches(acc: &AccountInfo<'_>) {
+    // Keep is_native symbolic, hit pack through an extra call frame, and exercise COption::<u64>::is_some
     cheatcode_is_spl_account(acc);
+
     let account = get_account(acc);
     let mut borrow = acc.data.borrow_mut();
     pack_account_inner(&mut borrow, &account);
-}
-
-fn pack_account_inner(buf: &mut [u8], account: &Account) {
-    Account::pack(account.clone(), buf).unwrap();
-}
 
-fn test_spl_account_is_native_branch(acc: &AccountInfo<'_>) {
-    // Keep is_native symbolic and exercise COption::<u64>::is_some to reproduce the ndbranch
-    cheatcode_is_spl_account(acc);
-    let account = get_account(acc);
     let _ = account.is_native();
 }
 
@@ -263,6 +254,10 @@ fn get_multisig(acc: &AccountInfo<'_>) -> Multisig {
     Multisig::unpack_unchecked(&acc.data.borrow()).unwrap()
 }
 
+fn pack_account_inner(buf: &mut [u8], account: &Account) {
+    Account::pack(account.clone(), buf).unwrap();
+}
+
 #[inline(never)]
 fn cheatcode_is_spl_account(_: &AccountInfo<'_>) {}
 

kmir/src/tests/integration/test_integration.py

@@ -38,7 +38,6 @@
     'assume-cheatcode-conflict-fail': ['check_assume_conflict'],
     'transmute-bytes': ['bytes_to_u64', 'u64_to_bytes'],
     'spl_token_domain_data': [
-        'test_spl_account_pack_is_native_branch',
         'test_spl_account_is_native_branch',
         'test_spl_account_domain_data',
         'test_spl_mint_domain_data',