fix ci lint etc

Author: snawaz

test-integration/schedulecommit/client/src/schedule_commit_context.rs

@@ -113,7 +113,7 @@ impl ScheduleCommitTestContext {
                 )
                 .unwrap();
                 let (pda, _bump) = Pubkey::find_program_address(
-                    &[user_seed, &payer_ephem.pubkey().as_ref()],
+                    &[user_seed, payer_ephem.pubkey().as_ref()],
                     &program_schedulecommit::ID,
                 );
                 (payer_ephem, pda)

test-integration/schedulecommit/test-scenarios/tests/03_commits_fee_payer.rs

@@ -27,9 +27,12 @@ const NEEDS_TO_BE_OWNED_BY_INVOKING_PROGRAM: &str =
 
 fn prepare_ctx_with_account_to_commit() -> ScheduleCommitTestContext {
     let ctx = if std::env::var("FIXED_KP").is_ok() {
-        ScheduleCommitTestContext::try_new(2)
+        ScheduleCommitTestContext::try_new(2, b"magic_schedule_commit")
     } else {
-        ScheduleCommitTestContext::try_new_random_keys(2)
+        ScheduleCommitTestContext::try_new_random_keys(
+            2,
+            b"magic_schedule_commit",
+        )
     }
     .unwrap();
     ctx.init_committees().unwrap();

test-integration/schedulecommit/test-security/tests/01_invocations.rs

@@ -149,10 +149,10 @@ pub fn generate_random_bytes(length: usize) -> Vec<u8> {
 #[allow(dead_code)]
 pub fn create_commit_task(data: &[u8]) -> CommitTask {
     static COMMIT_ID: AtomicU64 = AtomicU64::new(0);
-    CommitTask {
-        commit_id: COMMIT_ID.fetch_add(1, Ordering::Relaxed),
-        allow_undelegation: false,
-        committed_account: CommittedAccount {
+    CommitTask::new(
+        COMMIT_ID.fetch_add(1, Ordering::Relaxed),
+        false,
+        CommittedAccount {
             pubkey: Pubkey::new_unique(),
             account: Account {
                 lamports: 1000,
@@ -162,7 +162,7 @@ pub fn create_commit_task(data: &[u8]) -> CommitTask {
                 rent_epoch: 0,
             },
         },
-    }
+    )
 }
 
 #[allow(dead_code)]

test-integration/test-committor-service/tests/common.rs

@@ -35,11 +35,11 @@ async fn test_prepare_commit_tx_with_single_account() {
     let committed_account = create_committed_account(&account_data);
 
     let tasks = vec![
-        Box::new(ArgsTask::new(ArgsTaskType::Commit(CommitTask {
-            commit_id: 1,
-            committed_account: committed_account.clone(),
-            allow_undelegation: true,
-        }))) as Box<dyn BaseTask>,
+        Box::new(ArgsTask::new(ArgsTaskType::Commit(CommitTask::new(
+            1,
+            true,
+            committed_account.clone(),
+        )))) as Box<dyn BaseTask>,
         Box::new(ArgsTask::new(ArgsTaskType::Finalize(FinalizeTask {
             delegated_account: committed_account.pubkey,
         }))),
@@ -89,21 +89,18 @@ async fn test_prepare_commit_tx_with_multiple_accounts() {
     let account2_data = generate_random_bytes(12);
     let committed_account2 = create_committed_account(&account2_data);
 
-    let buffer_commit_task = BufferTask::new_preparation_required(
-        BufferTaskType::Commit(CommitTask {
-            commit_id: 1,
-            committed_account: committed_account2.clone(),
-            allow_undelegation: true,
-        }),
-    );
+    let buffer_commit_task =
+        BufferTask::new_preparation_required(BufferTaskType::Commit(
+            CommitTask::new(1, true, committed_account2.clone()),
+        ));
     // Create test data
     let tasks = vec![
         // account 1
-        Box::new(ArgsTask::new(ArgsTaskType::Commit(CommitTask {
-            commit_id: 1,
-            committed_account: committed_account1.clone(),
-            allow_undelegation: true,
-        }))) as Box<dyn BaseTask>,
+        Box::new(ArgsTask::new(ArgsTaskType::Commit(CommitTask::new(
+            1,
+            true,
+            committed_account1.clone(),
+        )))) as Box<dyn BaseTask>,
         // account 2
         Box::new(buffer_commit_task),
         // finalize account 1
@@ -186,13 +183,10 @@ async fn test_prepare_commit_tx_with_base_actions() {
         }],
     };
 
-    let buffer_commit_task = BufferTask::new_preparation_required(
-        BufferTaskType::Commit(CommitTask {
-            commit_id: 1,
-            committed_account: committed_account.clone(),
-            allow_undelegation: true,
-        }),
-    );
+    let buffer_commit_task =
+        BufferTask::new_preparation_required(BufferTaskType::Commit(
+            CommitTask::new(1, true, committed_account.clone()),
+        ));
     let tasks = vec![
         // commit account
         Box::new(buffer_commit_task.clone()) as Box<dyn BaseTask>,

test-integration/test-committor-service/tests/test_transaction_preparator.rs

@@ -154,8 +154,9 @@ impl IntegrationTestContext {
         rpc_client: Option<&RpcClient>,
         label: &str,
     ) -> Option<Vec<String>> {
-        let rpc_client = rpc_client
-            .expect(&format!("rpc_client for [{label}] does not exist"));
+        let rpc_client = rpc_client.unwrap_or_else(|| {
+            panic!("rpc_client for [{label}] does not exist")
+        });
 
         // Try this up to 50 times since devnet here returns the version response instead of
         // the EncodedConfirmedTransactionWithStatusMeta at times