Skip to content

Commit

Permalink
Fix a couple merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ismellike committed Sep 15, 2023
1 parent ef464b3 commit 4f836cc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
8 changes: 8 additions & 0 deletions contracts/voting/dao-voting-token-staked/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ pub const STAKED_TOTAL: SnapshotItem<Uint128> = SnapshotItem::new(
Strategy::EveryBlock,
);

/// Keeps track of voting power limits by address
pub const LIMITS: SnapshotMap<&Addr, Uint128> = SnapshotMap::new(
"limits",
"limits__checkpoints",
"limits__changelog",
Strategy::EveryBlock,
);

/// The maximum number of claims that may be outstanding.
pub const MAX_CLAIMS: u64 = 100;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,9 @@ pub fn test_limit() {
&mut app,
staking_id,
InstantiateMsg {
denom: DENOM.to_string(),
token_info: TokenInfo::Existing {
denom: DENOM.to_string(),
},
unstaking_duration: Some(Duration::Height(5)),
active_threshold: Some(ActiveThreshold::Percentage {
percent: Decimal::percent(20),
Expand Down

0 comments on commit 4f836cc

Please sign in to comment.