github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

dao::propose() validate.rs: rename State to DaoState

Browse Source
This commit is contained in:
narodnik
2022-08-19 09:10:46 +02:00
parent aeb2da0a8e
commit b961db7e4e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/daod/src/dao_contract/propose/validate.rs
View File

@@ -1,7 +1,3 @@
use crate::{
dao_contract::{DaoBulla, State},
demo::{CallDataBase, StateRegistry, Transaction},
};
use darkfi::{
crypto::{
keypair::PublicKey, merkle_node::MerkleNode, schnorr, schnorr::SchnorrPublic,
@@ -18,7 +14,12 @@ use pasta_curves::{
};
use std::any::{Any, TypeId};
use crate::{money_contract::state::State as MoneyState, note::EncryptedNote2};
use crate::{
dao_contract::{DaoBulla, State as DaoState},
demo::{CallDataBase, StateRegistry, Transaction},
money_contract::state::State as MoneyState,
note::EncryptedNote2,
};
const TARGET: &str = "dao_contract::propose::validate::state_transition()";
@@ -144,7 +145,7 @@ pub fn state_transition(
}
}
let state = states.lookup::<State>(&"DAO".to_string()).unwrap();
let state = states.lookup::<DaoState>(&"DAO".to_string()).unwrap();
// Is the DAO bulla generated in the ZK proof valid
if !state.is_valid_dao_merkle(&call_data.header.dao_merkle_root) {
@@ -177,6 +178,6 @@ pub struct Update {
}
pub fn apply(states: &mut StateRegistry, update: Update) {
let state = states.lookup_mut::<State>(&"DAO".to_string()).unwrap();
let state = states.lookup_mut::<DaoState>(&"DAO".to_string()).unwrap();
state.add_proposal_bulla(update.proposal_bulla);
}