From c061a34cde77e96a22b9a345c63f2c7d3e7cd25c Mon Sep 17 00:00:00 2001 From: Daniel Kelleher Date: Thu, 7 Jul 2022 20:10:20 +0200 Subject: [PATCH] Now that token deposits can be used as inputs to vote plugins, remove the constraint that prevents token deposits when a vote plugin is used. (#3311) --- .../process_deposit_governing_tokens.rs | 2 -- governance/program/src/state/realm.rs | 15 ------------- .../use_realm_with_voter_weight_addin.rs | 21 ------------------- 3 files changed, 38 deletions(-) diff --git a/governance/program/src/processor/process_deposit_governing_tokens.rs b/governance/program/src/processor/process_deposit_governing_tokens.rs index edaf4f38..4d428f07 100644 --- a/governance/program/src/processor/process_deposit_governing_tokens.rs +++ b/governance/program/src/processor/process_deposit_governing_tokens.rs @@ -45,8 +45,6 @@ pub fn process_deposit_governing_tokens( let realm_data = get_realm_data(program_id, realm_info)?; let governing_token_mint = get_spl_token_mint(governing_token_holding_info)?; - realm_data.asset_governing_tokens_deposits_allowed(&governing_token_mint)?; - realm_data.assert_is_valid_governing_token_mint_and_holding( program_id, realm_info.key, diff --git a/governance/program/src/state/realm.rs b/governance/program/src/state/realm.rs index 12b0165e..ff498d5d 100644 --- a/governance/program/src/state/realm.rs +++ b/governance/program/src/state/realm.rs @@ -226,21 +226,6 @@ impl RealmV2 { Ok(()) } - /// Asserts the given governing token can be deposited into the realm - pub fn asset_governing_tokens_deposits_allowed( - &self, - governing_token_mint: &Pubkey, - ) -> Result<(), ProgramError> { - // If the deposit is for the community token and the realm uses community voter weight addin then panic - if self.config.use_community_voter_weight_addin - && self.community_mint == *governing_token_mint - { - return Err(GovernanceError::GoverningTokenDepositsNotAllowed.into()); - } - - Ok(()) - } - /// Assert the given create authority can create governance pub fn assert_create_authority_can_create_governance( &self, diff --git a/governance/program/tests/use_realm_with_voter_weight_addin.rs b/governance/program/tests/use_realm_with_voter_weight_addin.rs index 4a7428f8..08ba5c42 100644 --- a/governance/program/tests/use_realm_with_voter_weight_addin.rs +++ b/governance/program/tests/use_realm_with_voter_weight_addin.rs @@ -254,27 +254,6 @@ async fn test_create_program_governance_with_voter_weight_addin() { ); } -#[tokio::test] -async fn test_realm_with_voter_weight_addin_with_deposits_not_allowed() { - // Arrange - let mut governance_test = GovernanceProgramTest::start_with_voter_weight_addin().await; - let realm_cookie = governance_test.with_realm().await; - - // Act - - let err = governance_test - .with_community_token_deposit(&realm_cookie) - .await - .err() - .unwrap(); - - // Assert - assert_eq!( - err, - GovernanceError::GoverningTokenDepositsNotAllowed.into() - ); -} - #[tokio::test] async fn test_create_governance_with_voter_weight_action_error() { // Arrange