pr comments

- remove is_immutable and make admin optional - remove has one admin constraint as it is redundant with check_admin - fixed claim admin constraints and added test - fixed typos and other nits alike Signed-off-by: bingyuyap <[email protected]>
wormholelabs-xyz · Oct 24, 2024 · 54e887b · 54e887b
1 parent 64e3659
commit 54e887b
Show file tree

Hide file tree

Showing 19 changed files with 225 additions and 201 deletions.
diff --git a/svm/programs/mock-integrator/tests/add_transceiver.rs b/svm/programs/mock-integrator/tests/add_transceiver.rs
@@ -336,7 +336,7 @@ async fn test_add_transceiver_with_transfer_in_progress() {
     // Verify that the integrator config hasn't changed
     let integrator_config: IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config_pda).await;
-    assert_eq!(integrator_config.admin, admin.pubkey());
+    assert_eq!(integrator_config.admin, Some(admin.pubkey()));
     assert_eq!(
         integrator_config.pending_admin,
         Some(pending_admin.pubkey())

diff --git a/svm/programs/mock-integrator/tests/disable_transceiver.rs b/svm/programs/mock-integrator/tests/disable_transceiver.rs
@@ -444,7 +444,7 @@ async fn test_disable_transceiver_with_transfer_in_progress() {
     // Verify that the integrator config hasn't changed
     let integrator_config: IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config_pda).await;
-    assert_eq!(integrator_config.admin, admin.pubkey());
+    assert_eq!(integrator_config.admin, Some(admin.pubkey()));
     assert_eq!(
         integrator_config.pending_admin,
         Some(pending_admin.pubkey())
@@ -515,5 +515,5 @@ async fn test_disable_transceiver_with_immutable_config() {
     // Verify that the integrator config is immutable
     let integrator_config: IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config_pda).await;
-    assert_eq!(integrator_config.is_immutable, true);
+    assert_eq!(integrator_config.admin, None);
 }
diff --git a/svm/programs/mock-integrator/tests/discard_admin.rs b/svm/programs/mock-integrator/tests/discard_admin.rs
@@ -52,7 +52,7 @@ async fn test_discard_admin_success() {
     // Verify that the admin has been discarded
     let integrator_config: IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config_pda).await;
-    assert_eq!(integrator_config.is_immutable, true);
+    assert_eq!(integrator_config.admin, None);
 }
 
 #[tokio::test]

diff --git a/svm/programs/mock-integrator/tests/enable_transceiver.rs b/svm/programs/mock-integrator/tests/enable_transceiver.rs
@@ -508,5 +508,5 @@ async fn test_enable_transceiver_with_immutable_config() {
     // Verify that the integrator config is immutable
     let integrator_config: IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config_pda).await;
-    assert_eq!(integrator_config.is_immutable, true);
+    assert_eq!(integrator_config.admin, None);
 }
diff --git a/svm/programs/mock-integrator/tests/register.rs b/svm/programs/mock-integrator/tests/register.rs
@@ -41,7 +41,7 @@ async fn test_invoke_register() {
     let integrator_config_data: router::state::IntegratorConfig =
         get_account(&mut context.banks_client, integrator_config).await;
 
-    assert_eq!(integrator_config_data.admin, admin.pubkey());
+    assert_eq!(integrator_config_data.admin, Some(admin.pubkey()));
     assert_eq!(
         integrator_config_data.integrator_program_id,
         mock_integrator::id()