blockworks-foundation
/
voter-stake-registry
mirror of https://github.com/blockworks-foundation/voter-stake-registry.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify state:: use

This commit is contained in:
Christian Kamm 2021-12-03 09:52:48 +01:00
parent b91f9ba595
commit 0612a3f918
22 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/voter-stake-registry/src/instructions/clawback.rs
View File

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

3
programs/voter-stake-registry/src/instructions/close_deposit_entry.rs
View File

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

2
programs/voter-stake-registry/src/instructions/close_voter.rs
View File

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

5
programs/voter-stake-registry/src/instructions/create_deposit_entry.rs
View File

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

2
programs/voter-stake-registry/src/instructions/create_exchange_rate.rs
View File

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

2
programs/voter-stake-registry/src/instructions/create_registrar.rs
View File

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

4
programs/voter-stake-registry/src/instructions/create_voter.rs
View File

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

3
programs/voter-stake-registry/src/instructions/deposit.rs
View File

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

3
programs/voter-stake-registry/src/instructions/reset_lockup.rs
View File

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

2
programs/voter-stake-registry/src/instructions/set_time_offset.rs
View File

@ -1,5 +1,5 @@
use crate::error::*;
use crate::state::registrar::Registrar;
use crate::state::*;
use anchor_lang::prelude::*;
use std::str::FromStr;

3
programs/voter-stake-registry/src/instructions/update_max_vote_weight.rs
View File

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

4
programs/voter-stake-registry/src/instructions/update_voter_weight_record.rs
View File

@ -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";

4
programs/voter-stake-registry/src/instructions/withdraw.rs
View File

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

2
programs/voter-stake-registry/src/lib.rs
View File

@ -1,7 +1,7 @@
use anchor_lang::prelude::*;
use error::*;
use instructions::*;
use state::lockup::*;
use state::*;
mod error;
mod instructions;

16
programs/voter-stake-registry/src/state/mod.rs
View File

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

9
programs/voter-stake-registry/tests/program_test/addin.rs
View File

@ -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

2
programs/voter-stake-registry/tests/test_basic.rs
View File

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

2
programs/voter-stake-registry/tests/test_clawback.rs
View File

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

2
programs/voter-stake-registry/tests/test_deposit_cliff.rs
View File

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

2
programs/voter-stake-registry/tests/test_deposit_daily_vesting.rs
View File

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

2
programs/voter-stake-registry/tests/test_deposit_monthly_vesting.rs
View File

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

2
programs/voter-stake-registry/tests/test_deposit_no_locking.rs
View File

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