Skip to content

Commit

Permalink
fixup! Merge branch 'brent/refactor-proposal-loading' into brent/draf…
Browse files Browse the repository at this point in the history 
…t+pos
  • Loading branch information
@brentstone @tzemanovic
brentstone authored and tzemanovic committed Apr 3, 2024
1 parent bd47a03 commit 36201f2
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 36 deletions.
2 changes: 1 addition & 1 deletion crates/apps/src/lib/node/ledger/shell/finalize_block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ mod test_finalize_block {
voting_start_epoch: Epoch::default(),
voting_end_epoch: Epoch::default().next(),
activation_epoch: Epoch::default().next(),
r#type: ProposalType::Default(None),
r#type: ProposalType::Default,
};

namada::governance::init_proposal(
Expand Down
73 changes: 38 additions & 35 deletions crates/namada/src/ledger/governance/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,9 +865,9 @@ mod test {
use borsh_ext::BorshSerializeExt;
use namada_gas::{TxGasMeter, VpGasMeter};
use namada_governance::storage::keys::{
get_author_key, get_committing_proposals_key, get_content_key,
get_counter_key, get_funds_key, get_grace_epoch_key,
get_proposal_type_key, get_vote_proposal_key, get_voting_end_epoch_key,
get_activation_epoch_key, get_author_key, get_committing_proposals_key,
get_content_key, get_counter_key, get_funds_key, get_proposal_type_key,
get_vote_proposal_key, get_voting_end_epoch_key,
get_voting_start_epoch_key,
};
use namada_governance::{ProposalType, ProposalVote, ADDRESS};
Expand Down Expand Up @@ -1012,17 +1012,20 @@ mod test {
}
}

fn get_proposal_keys(proposal_id: u64, grace_epoch: u64) -> BTreeSet<Key> {
fn get_proposal_keys(
proposal_id: u64,
activation_epoch: u64,
) -> BTreeSet<Key> {
let counter_key = get_counter_key();
let voting_end_epoch_key = get_voting_end_epoch_key(proposal_id);
let voting_start_epoch_key = get_voting_start_epoch_key(proposal_id);
let grace_epoch_key = get_grace_epoch_key(proposal_id);
let activation_epoch_key = get_activation_epoch_key(proposal_id);
let content_key = get_content_key(proposal_id);
let author_key = get_author_key(proposal_id);
let proposal_type_key = get_proposal_type_key(proposal_id);
let funds_key = get_funds_key(proposal_id);
let commiting_key =
get_committing_proposals_key(proposal_id, grace_epoch);
get_committing_proposals_key(proposal_id, activation_epoch);

BTreeSet::from([
counter_key.clone(),
Expand All @@ -1032,7 +1035,7 @@ mod test {
proposal_type_key.clone(),
voting_start_epoch_key.clone(),
voting_end_epoch_key.clone(),
grace_epoch_key.clone(),
activation_epoch_key.clone(),
commiting_key.clone(),
])
}
Expand Down Expand Up @@ -1084,7 +1087,7 @@ mod test {
let counter_key = get_counter_key();
let voting_end_epoch_key = get_voting_end_epoch_key(proposal_id);
let voting_start_epoch_key = get_voting_start_epoch_key(proposal_id);
let grace_epoch_key = get_grace_epoch_key(proposal_id);
let activation_epoch_key = get_activation_epoch_key(proposal_id);
let content_key = get_content_key(proposal_id);
let author_key = get_author_key(proposal_id);
let proposal_type_key = get_proposal_type_key(proposal_id);
Expand Down Expand Up @@ -1113,7 +1116,7 @@ mod test {
.unwrap();
state
.write_log_mut()
.write(&grace_epoch_key, Epoch(grace_epoch).serialize_to_vec())
.write(&activation_epoch_key, Epoch(grace_epoch).serialize_to_vec())
.unwrap();
state
.write_log_mut()
Expand Down Expand Up @@ -1147,9 +1150,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -1244,9 +1247,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -1344,9 +1347,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -1680,12 +1683,12 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let counter_key = get_counter_key();
let voting_end_epoch_key = get_voting_end_epoch_key(proposal_id);
let voting_start_epoch_key = get_voting_start_epoch_key(proposal_id);
let grace_epoch_key = get_grace_epoch_key(proposal_id);
let activation_epoch_key = get_activation_epoch_key(proposal_id);
let content_key = get_content_key(proposal_id);
let author_key = get_author_key(proposal_id);
let proposal_type_key = get_proposal_type_key(proposal_id);
Expand All @@ -1699,7 +1702,7 @@ mod test {
proposal_type_key.clone(),
voting_start_epoch_key.clone(),
voting_end_epoch_key.clone(),
grace_epoch_key.clone(),
activation_epoch_key.clone(),
]);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -1746,7 +1749,7 @@ mod test {
509,
3,
9,
grace_epoch,
activation_epoch,
&signer_address,
true,
);
Expand Down Expand Up @@ -1777,12 +1780,12 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let counter_key = get_counter_key();
let voting_end_epoch_key = get_voting_end_epoch_key(proposal_id);
let voting_start_epoch_key = get_voting_start_epoch_key(proposal_id);
let grace_epoch_key = get_grace_epoch_key(proposal_id);
let activation_epoch_key = get_activation_epoch_key(proposal_id);
let content_key = get_content_key(proposal_id);
let author_key = get_author_key(proposal_id);
let proposal_type_key = get_proposal_type_key(proposal_id);
Expand All @@ -1796,7 +1799,7 @@ mod test {
proposal_type_key.clone(),
voting_start_epoch_key.clone(),
voting_end_epoch_key.clone(),
grace_epoch_key.clone(),
activation_epoch_key.clone(),
]);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
Expand Down Expand Up @@ -1843,7 +1846,7 @@ mod test {
500,
0,
9,
grace_epoch,
activation_epoch,
&signer_address,
false,
);
Expand Down Expand Up @@ -1874,9 +1877,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -1998,9 +2001,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -2122,9 +2125,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -2246,9 +2249,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -2387,9 +2390,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down Expand Up @@ -2528,9 +2531,9 @@ mod test {
let mut state = init_storage();

let proposal_id = 0;
let grace_epoch = 19;
let activation_epoch = 19;

let mut keys_changed = get_proposal_keys(proposal_id, grace_epoch);
let mut keys_changed = get_proposal_keys(proposal_id, activation_epoch);

let gas_meter = RefCell::new(VpGasMeter::new_from_tx_meter(
&TxGasMeter::new_from_sub_limit(u64::MAX.into()),
Expand Down

0 comments on commit 36201f2

Please sign in to comment.