Simplify state:: use

programs/voter-stake-registry/src/instructions/clawback.rs

@@ -1,6 +1,5 @@
 use crate::error::*;
-use crate::state::lockup::*;
+use crate::state::*;
-use crate::state::registrar::registrar_seeds;
 use anchor_lang::prelude::*;
 use anchor_spl::token;
 

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::*;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 
 #[derive(Accounts)]

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)]

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::*;
-use crate::state::lockup::*;
-use crate::state::registrar::Registrar;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
 

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};

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;

programs/voter-stake-registry/src/instructions/create_voter.rs

@@ -1,7 +1,5 @@
 use crate::error::*;
-use crate::state::lockup::*;
+use crate::state::*;
-use crate::state::registrar::Registrar;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 use anchor_lang::solana_program::sysvar::instructions as tx_instructions;
 use spl_governance::addins::voter_weight::VoterWeightAccountType;

programs/voter-stake-registry/src/instructions/deposit.rs

@@ -1,6 +1,5 @@
 use crate::error::*;
-use crate::state::registrar::Registrar;
+use crate::state::*;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 use anchor_spl::token::{self, Mint, Token, TokenAccount};
 use std::convert::TryFrom;

programs/voter-stake-registry/src/instructions/reset_lockup.rs

@@ -1,6 +1,5 @@
 use crate::error::*;
-use crate::state::registrar::Registrar;
+use crate::state::*;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 
 #[derive(Accounts)]

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;
 

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::*;
-use crate::state::registrar::Registrar;
 use anchor_lang::prelude::*;
 use anchor_spl::token::Mint;
 

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::*;
-use crate::state::registrar::Registrar;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 
 pub const VOTER_WEIGHT_RECORD: [u8; 19] = *b"voter-weight-record";

programs/voter-stake-registry/src/instructions/withdraw.rs

@@ -1,7 +1,5 @@
 use crate::error::*;
-use crate::state::registrar::registrar_seeds;
+use crate::state::*;
-use crate::state::registrar::Registrar;
-use crate::state::voter::Voter;
 use anchor_lang::prelude::*;
 use anchor_spl::token::{self, Mint, Token, TokenAccount};
 use spl_governance::state::token_owner_record;

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;

programs/voter-stake-registry/src/state/mod.rs

@@ -1,5 +1,11 @@
-pub mod deposit_entry;
+pub use deposit_entry::*;
-pub mod exchange_entry;
+pub use exchange_entry::*;
-pub mod lockup;
+pub use lockup::*;
-pub mod registrar;
+pub use registrar::*;
-pub mod voter;
+pub use voter::*;
+
+mod deposit_entry;
+mod exchange_entry;
+mod lockup;
+mod registrar;
+mod voter;

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<voter_stake_registry::state::lockup::VoterWeightRecord, TransportError>
+    ) -> std::result::Result<voter_stake_registry::state::VoterWeightRecord, TransportError> {
-    {
         let data = anchor_lang::InstructionData::data(
             &voter_stake_registry::instruction::UpdateVoterWeightRecord {},
         );
@@ -432,7 +431,7 @@ impl AddinCookie {
 
         Ok(self
             .solana
-            .get_account::<voter_stake_registry::state::lockup::VoterWeightRecord>(
+            .get_account::<voter_stake_registry::state::VoterWeightRecord>(
                 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::<voter_stake_registry::state::voter::Voter>(self.address)
+            .get_account::<voter_stake_registry::state::Voter>(self.address)
             .await
             .deposits[deposit_id as usize]
             .amount_deposited_native

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,
         )

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,
         )

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,
         )

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,
         )

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,
         )

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;