From 0612a3f918ae8e09dd1218bcbc6ac9bca271f54f Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 3 Dec 2021 09:52:48 +0100 Subject: [PATCH] Simplify state:: use --- .../src/instructions/clawback.rs | 3 +-- .../src/instructions/close_deposit_entry.rs | 3 +-- .../src/instructions/close_voter.rs | 2 +- .../src/instructions/create_deposit_entry.rs | 5 +---- .../src/instructions/create_exchange_rate.rs | 2 +- .../src/instructions/create_registrar.rs | 2 +- .../src/instructions/create_voter.rs | 4 +--- .../src/instructions/deposit.rs | 3 +-- .../src/instructions/reset_lockup.rs | 3 +-- .../src/instructions/set_time_offset.rs | 2 +- .../src/instructions/update_max_vote_weight.rs | 3 +-- .../instructions/update_voter_weight_record.rs | 4 +--- .../src/instructions/withdraw.rs | 4 +--- programs/voter-stake-registry/src/lib.rs | 2 +- programs/voter-stake-registry/src/state/mod.rs | 16 +++++++++++----- .../tests/program_test/addin.rs | 9 ++++----- .../voter-stake-registry/tests/test_basic.rs | 2 +- .../voter-stake-registry/tests/test_clawback.rs | 2 +- .../tests/test_deposit_cliff.rs | 2 +- .../tests/test_deposit_daily_vesting.rs | 2 +- .../tests/test_deposit_monthly_vesting.rs | 2 +- .../tests/test_deposit_no_locking.rs | 2 +- 22 files changed, 35 insertions(+), 44 deletions(-) diff --git a/programs/voter-stake-registry/src/instructions/clawback.rs b/programs/voter-stake-registry/src/instructions/clawback.rs index f698d33..b755bca 100644 --- a/programs/voter-stake-registry/src/instructions/clawback.rs +++ b/programs/voter-stake-registry/src/instructions/clawback.rs @@ -1,6 +1,5 @@ use crate::error::*; -use crate::state::lockup::*; -use crate::state::registrar::registrar_seeds; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token; diff --git a/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs b/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs index 4c81de3..8013249 100644 --- a/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs +++ b/programs/voter-stake-registry/src/instructions/close_deposit_entry.rs @@ -1,6 +1,5 @@ use crate::error::*; -use crate::state::deposit_entry::DepositEntry; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; #[derive(Accounts)] diff --git a/programs/voter-stake-registry/src/instructions/close_voter.rs b/programs/voter-stake-registry/src/instructions/close_voter.rs index d5d5def..83004d5 100644 --- a/programs/voter-stake-registry/src/instructions/close_voter.rs +++ b/programs/voter-stake-registry/src/instructions/close_voter.rs @@ -1,5 +1,5 @@ use crate::error::*; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; #[derive(Accounts)] diff --git a/programs/voter-stake-registry/src/instructions/create_deposit_entry.rs b/programs/voter-stake-registry/src/instructions/create_deposit_entry.rs index 826de8b..d50f23e 100644 --- a/programs/voter-stake-registry/src/instructions/create_deposit_entry.rs +++ b/programs/voter-stake-registry/src/instructions/create_deposit_entry.rs @@ -1,8 +1,5 @@ use crate::error::*; -use crate::state::deposit_entry::DepositEntry; -use crate::state::lockup::*; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token::Mint; diff --git a/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs b/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs index d77d92f..6e3b164 100644 --- a/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs +++ b/programs/voter-stake-registry/src/instructions/create_exchange_rate.rs @@ -1,5 +1,5 @@ use crate::error::*; -use crate::state::registrar::Registrar; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::associated_token::AssociatedToken; use anchor_spl::token::{Mint, Token, TokenAccount}; diff --git a/programs/voter-stake-registry/src/instructions/create_registrar.rs b/programs/voter-stake-registry/src/instructions/create_registrar.rs index 8f9edaf..994f965 100644 --- a/programs/voter-stake-registry/src/instructions/create_registrar.rs +++ b/programs/voter-stake-registry/src/instructions/create_registrar.rs @@ -1,5 +1,5 @@ use crate::error::*; -use crate::state::registrar::Registrar; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token::{Mint, Token}; use spl_governance::state::realm; diff --git a/programs/voter-stake-registry/src/instructions/create_voter.rs b/programs/voter-stake-registry/src/instructions/create_voter.rs index 64998a4..75245a6 100644 --- a/programs/voter-stake-registry/src/instructions/create_voter.rs +++ b/programs/voter-stake-registry/src/instructions/create_voter.rs @@ -1,7 +1,5 @@ use crate::error::*; -use crate::state::lockup::*; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; use anchor_lang::solana_program::sysvar::instructions as tx_instructions; use spl_governance::addins::voter_weight::VoterWeightAccountType; diff --git a/programs/voter-stake-registry/src/instructions/deposit.rs b/programs/voter-stake-registry/src/instructions/deposit.rs index 8bef40a..0a26eac 100644 --- a/programs/voter-stake-registry/src/instructions/deposit.rs +++ b/programs/voter-stake-registry/src/instructions/deposit.rs @@ -1,6 +1,5 @@ use crate::error::*; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token::{self, Mint, Token, TokenAccount}; use std::convert::TryFrom; diff --git a/programs/voter-stake-registry/src/instructions/reset_lockup.rs b/programs/voter-stake-registry/src/instructions/reset_lockup.rs index a0c5fbc..0ea5b34 100644 --- a/programs/voter-stake-registry/src/instructions/reset_lockup.rs +++ b/programs/voter-stake-registry/src/instructions/reset_lockup.rs @@ -1,6 +1,5 @@ use crate::error::*; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; #[derive(Accounts)] diff --git a/programs/voter-stake-registry/src/instructions/set_time_offset.rs b/programs/voter-stake-registry/src/instructions/set_time_offset.rs index 70b1713..49b3dcf 100644 --- a/programs/voter-stake-registry/src/instructions/set_time_offset.rs +++ b/programs/voter-stake-registry/src/instructions/set_time_offset.rs @@ -1,5 +1,5 @@ use crate::error::*; -use crate::state::registrar::Registrar; +use crate::state::*; use anchor_lang::prelude::*; use std::str::FromStr; diff --git a/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs b/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs index 1df2623..6546252 100644 --- a/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs +++ b/programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs @@ -1,6 +1,5 @@ use crate::error::*; -use crate::state::deposit_entry::{FIXED_VOTE_WEIGHT_FACTOR, LOCKING_VOTE_WEIGHT_FACTOR}; -use crate::state::registrar::Registrar; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token::Mint; diff --git a/programs/voter-stake-registry/src/instructions/update_voter_weight_record.rs b/programs/voter-stake-registry/src/instructions/update_voter_weight_record.rs index 158e325..87b4209 100644 --- a/programs/voter-stake-registry/src/instructions/update_voter_weight_record.rs +++ b/programs/voter-stake-registry/src/instructions/update_voter_weight_record.rs @@ -1,7 +1,5 @@ use crate::error::*; -use crate::state::lockup::*; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; pub const VOTER_WEIGHT_RECORD: [u8; 19] = *b"voter-weight-record"; diff --git a/programs/voter-stake-registry/src/instructions/withdraw.rs b/programs/voter-stake-registry/src/instructions/withdraw.rs index 7a5fc22..5415140 100644 --- a/programs/voter-stake-registry/src/instructions/withdraw.rs +++ b/programs/voter-stake-registry/src/instructions/withdraw.rs @@ -1,7 +1,5 @@ use crate::error::*; -use crate::state::registrar::registrar_seeds; -use crate::state::registrar::Registrar; -use crate::state::voter::Voter; +use crate::state::*; use anchor_lang::prelude::*; use anchor_spl::token::{self, Mint, Token, TokenAccount}; use spl_governance::state::token_owner_record; diff --git a/programs/voter-stake-registry/src/lib.rs b/programs/voter-stake-registry/src/lib.rs index 6aa5b88..cc14f6c 100644 --- a/programs/voter-stake-registry/src/lib.rs +++ b/programs/voter-stake-registry/src/lib.rs @@ -1,7 +1,7 @@ use anchor_lang::prelude::*; use error::*; use instructions::*; -use state::lockup::*; +use state::*; mod error; mod instructions; diff --git a/programs/voter-stake-registry/src/state/mod.rs b/programs/voter-stake-registry/src/state/mod.rs index 9af27c1..293db08 100644 --- a/programs/voter-stake-registry/src/state/mod.rs +++ b/programs/voter-stake-registry/src/state/mod.rs @@ -1,5 +1,11 @@ -pub mod deposit_entry; -pub mod exchange_entry; -pub mod lockup; -pub mod registrar; -pub mod voter; +pub use deposit_entry::*; +pub use exchange_entry::*; +pub use lockup::*; +pub use registrar::*; +pub use voter::*; + +mod deposit_entry; +mod exchange_entry; +mod lockup; +mod registrar; +mod voter; diff --git a/programs/voter-stake-registry/tests/program_test/addin.rs b/programs/voter-stake-registry/tests/program_test/addin.rs index 005c160..85d4b56 100644 --- a/programs/voter-stake-registry/tests/program_test/addin.rs +++ b/programs/voter-stake-registry/tests/program_test/addin.rs @@ -230,7 +230,7 @@ impl AddinCookie { voter_authority: &Keypair, exchange_rate: &ExchangeRateCookie, deposit_entry_index: u8, - lockup_kind: voter_stake_registry::state::lockup::LockupKind, + lockup_kind: voter_stake_registry::state::LockupKind, periods: i32, allow_clawback: bool, ) -> std::result::Result<(), TransportError> { @@ -406,8 +406,7 @@ impl AddinCookie { &self, registrar: &RegistrarCookie, voter: &VoterCookie, - ) -> std::result::Result - { + ) -> std::result::Result { let data = anchor_lang::InstructionData::data( &voter_stake_registry::instruction::UpdateVoterWeightRecord {}, ); @@ -432,7 +431,7 @@ impl AddinCookie { Ok(self .solana - .get_account::( + .get_account::( voter.voter_weight_record, ) .await) @@ -518,7 +517,7 @@ impl ExchangeRateCookie { impl VoterCookie { pub async fn deposit_amount(&self, solana: &SolanaCookie, deposit_id: u8) -> u64 { solana - .get_account::(self.address) + .get_account::(self.address) .await .deposits[deposit_id as usize] .amount_deposited_native diff --git a/programs/voter-stake-registry/tests/test_basic.rs b/programs/voter-stake-registry/tests/test_basic.rs index 9b5e58a..160fa2c 100644 --- a/programs/voter-stake-registry/tests/test_basic.rs +++ b/programs/voter-stake-registry/tests/test_basic.rs @@ -63,7 +63,7 @@ async fn test_basic() -> Result<(), TransportError> { voter_authority, &mngo_rate, 0, - voter_stake_registry::state::lockup::LockupKind::Cliff, + voter_stake_registry::state::LockupKind::Cliff, 0, false, ) diff --git a/programs/voter-stake-registry/tests/test_clawback.rs b/programs/voter-stake-registry/tests/test_clawback.rs index 1ed2b99..46c85fb 100644 --- a/programs/voter-stake-registry/tests/test_clawback.rs +++ b/programs/voter-stake-registry/tests/test_clawback.rs @@ -86,7 +86,7 @@ async fn test_clawback() -> Result<(), TransportError> { voter_authority, &mngo_rate, 0, - voter_stake_registry::state::lockup::LockupKind::Daily, + voter_stake_registry::state::LockupKind::Daily, 10, true, ) diff --git a/programs/voter-stake-registry/tests/test_deposit_cliff.rs b/programs/voter-stake-registry/tests/test_deposit_cliff.rs index 64a0b98..3f00d0f 100644 --- a/programs/voter-stake-registry/tests/test_deposit_cliff.rs +++ b/programs/voter-stake-registry/tests/test_deposit_cliff.rs @@ -123,7 +123,7 @@ async fn test_deposit_cliff() -> Result<(), TransportError> { &voter_authority, &mngo_rate, 0, - voter_stake_registry::state::lockup::LockupKind::Cliff, + voter_stake_registry::state::LockupKind::Cliff, 3, // days false, ) diff --git a/programs/voter-stake-registry/tests/test_deposit_daily_vesting.rs b/programs/voter-stake-registry/tests/test_deposit_daily_vesting.rs index 53b5e30..71bd6ae 100644 --- a/programs/voter-stake-registry/tests/test_deposit_daily_vesting.rs +++ b/programs/voter-stake-registry/tests/test_deposit_daily_vesting.rs @@ -123,7 +123,7 @@ async fn test_deposit_daily_vesting() -> Result<(), TransportError> { &voter_authority, &mngo_rate, 0, - voter_stake_registry::state::lockup::LockupKind::Daily, + voter_stake_registry::state::LockupKind::Daily, 3, false, ) diff --git a/programs/voter-stake-registry/tests/test_deposit_monthly_vesting.rs b/programs/voter-stake-registry/tests/test_deposit_monthly_vesting.rs index 0c53748..b8e8b59 100644 --- a/programs/voter-stake-registry/tests/test_deposit_monthly_vesting.rs +++ b/programs/voter-stake-registry/tests/test_deposit_monthly_vesting.rs @@ -123,7 +123,7 @@ async fn test_deposit_monthly_vesting() -> Result<(), TransportError> { &voter_authority, &mngo_rate, 0, - voter_stake_registry::state::lockup::LockupKind::Monthly, + voter_stake_registry::state::LockupKind::Monthly, 3, false, ) diff --git a/programs/voter-stake-registry/tests/test_deposit_no_locking.rs b/programs/voter-stake-registry/tests/test_deposit_no_locking.rs index 64d3c69..62d2893 100644 --- a/programs/voter-stake-registry/tests/test_deposit_no_locking.rs +++ b/programs/voter-stake-registry/tests/test_deposit_no_locking.rs @@ -3,7 +3,7 @@ use solana_program_test::*; use solana_sdk::{pubkey::Pubkey, signature::Keypair, signer::Signer, transport::TransportError}; use program_test::*; -use voter_stake_registry::state::lockup::LockupKind; +use voter_stake_registry::state::LockupKind; mod program_test;