✨ Group together instruction calls within transaction macro

Ackee-Blockchain · Feb 24, 2025 · 828d320 · 828d320
1 parent 80812b4
commit 828d320
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/crates/syn/src/codegen/trident_transaction.rs b/crates/syn/src/codegen/trident_transaction.rs
@@ -14,6 +14,18 @@ impl ToTokens for TridentTransactionStruct {
             None => quote! { stringify!(#name).to_string() },
         };
 
+        // Generate instruction blocks for each field
+        let instruction_blocks = self.fields.iter().map(|f| {
+            let field_ident = &f.ident;
+            quote! {
+                {
+                    self.#field_ident.resolve_accounts(client, fuzz_accounts);
+                    self.#field_ident.set_accounts(client, fuzz_accounts);
+                    self.#field_ident.set_remaining_accounts(client, fuzz_accounts);
+                }
+            }
+        });
+
         let expanded = quote! {
             impl TransactionMethods for #name {
                 type IxAccounts = FuzzAccounts;
@@ -50,9 +62,7 @@ impl ToTokens for TridentTransactionStruct {
                     client: &mut impl FuzzClient,
                     fuzz_accounts: &mut FuzzAccounts,
                 ) -> Vec<Vec<AccountMeta>> {
-                    #(self.#field_idents.resolve_accounts(client, fuzz_accounts);)*
-                    #(self.#field_idents.set_accounts(client, fuzz_accounts);)*
-                    #(self.#field_idents.set_remaining_accounts(client, fuzz_accounts);)*
+                    #(#instruction_blocks)*
                     vec![
                         #(self.#field_idents.to_account_metas()),*
                     ]