Skip to content

Commit

Permalink
use references for box wrapper inputs in scans;
Browse files Browse the repository at this point in the history
  • Loading branch information
@greenhat
greenhat committed Sep 6, 2022
1 parent 2606f11 commit 8a13625
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 41 deletions.
1 change: 0 additions & 1 deletion core/src/cli_commands/bootstrap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,6 @@ pub(crate) mod tests {
let ballot_id = TokenId::from_base64(&encoded).unwrap();
assert_eq!(token_ids.ballot_token_id, ballot_id);

// TODO: check that it's updated with expected parameters (min_votes, etc.)
// Check that refresh contract is updated
assert_ne!(
oracle_config
Expand Down
64 changes: 24 additions & 40 deletions core/src/oracle_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::box_kind::{
};
use crate::contracts::ballot::BallotContract;
use crate::contracts::oracle::OracleContract;
use crate::contracts::refresh::RefreshContractInputs;
use crate::datapoint_source::{DataPointSource, DataPointSourceError};
use crate::oracle_config::ORACLE_CONFIG;
use crate::scans::{
Expand Down Expand Up @@ -110,25 +109,25 @@ pub struct Stage {
pub struct OraclePool<'a> {
pub data_point_source: Box<dyn DataPointSource + Sync + Send>,
/// Stages
pub datapoint_stage: DatapointStage,
local_oracle_datapoint_scan: Option<LocalOracleDatapointScan>,
pub datapoint_stage: DatapointStage<'a>,
local_oracle_datapoint_scan: Option<LocalOracleDatapointScan<'a>>,
local_ballot_box_scan: Option<LocalBallotBoxScan<'a>>,
pool_box_scan: PoolBoxScan,
refresh_box_scan: RefreshBoxScan,
pool_box_scan: PoolBoxScan<'a>,
refresh_box_scan: RefreshBoxScan<'a>,
ballot_boxes_scan: BallotBoxesScan<'a>,
update_box_scan: UpdateBoxScan<'a>,
}

#[derive(Debug)]
pub struct DatapointStage {
pub struct DatapointStage<'a> {
pub stage: Stage,
oracle_box_wrapper_inputs: OracleBoxWrapperInputs,
oracle_box_wrapper_inputs: &'a OracleBoxWrapperInputs,
}

#[derive(Debug)]
pub struct LocalOracleDatapointScan {
pub struct LocalOracleDatapointScan<'a> {
scan: Scan,
oracle_box_wrapper_inputs: OracleBoxWrapperInputs,
oracle_box_wrapper_inputs: &'a OracleBoxWrapperInputs,
}

#[derive(Debug)]
Expand All @@ -139,15 +138,15 @@ pub struct LocalBallotBoxScan<'a> {
}

#[derive(Debug)]
pub struct PoolBoxScan {
pub struct PoolBoxScan<'a> {
scan: Scan,
pool_box_wrapper_inputs: PoolBoxWrapperInputs,
pool_box_wrapper_inputs: &'a PoolBoxWrapperInputs,
}

#[derive(Debug)]
pub struct RefreshBoxScan {
pub struct RefreshBoxScan<'a> {
scan: Scan,
refresh_box_wrapper_inputs: RefreshBoxWrapperInputs,
refresh_box_wrapper_inputs: &'a RefreshBoxWrapperInputs,
}

#[derive(Debug)]
Expand All @@ -158,7 +157,6 @@ pub struct BallotBoxesScan<'a> {
#[derive(Debug)]
pub struct UpdateBoxScan<'a> {
scan: Scan,
// TODO: switch inputs to reference in other scans
update_box_wrapper_inputs: &'a UpdateBoxWrapperInputs,
}

Expand Down Expand Up @@ -210,20 +208,6 @@ impl<'a> OraclePool<'a> {
let datapoint_contract_address =
OracleContract::load(&config.oracle_box_wrapper_inputs.contract_inputs)?.ergo_tree();

let refresh_contract_inputs = RefreshContractInputs::load(
config
.refresh_box_wrapper_inputs
.contract_inputs
.contract_parameters()
.clone(),
config.token_ids.oracle_token_id.clone(),
config.token_ids.pool_nft_token_id.clone(),
)?;
let refresh_box_wrapper_inputs = RefreshBoxWrapperInputs {
contract_inputs: refresh_contract_inputs,
refresh_nft_token_id: config.token_ids.refresh_nft_token_id.clone(),
};

// If scanIDs.json exists, skip registering scans & saving generated ids
if !Path::new("scanIDs.json").exists() {
let mut scans = vec![
Expand All @@ -236,7 +220,7 @@ impl<'a> OraclePool<'a> {
register_pool_box_scan(config.pool_box_wrapper_inputs.clone()).unwrap(),
register_refresh_box_scan(
refresh_box_scan_name,
refresh_box_wrapper_inputs.clone(),
config.refresh_box_wrapper_inputs.clone(),
)
.unwrap(),
];
Expand Down Expand Up @@ -304,7 +288,7 @@ impl<'a> OraclePool<'a> {
"Local Oracle Datapoint Scan",
&scan_json[local_scan_str].to_string(),
),
oracle_box_wrapper_inputs: config.oracle_box_wrapper_inputs.clone(),
oracle_box_wrapper_inputs: &config.oracle_box_wrapper_inputs,
});
};

Expand All @@ -325,15 +309,15 @@ impl<'a> OraclePool<'a> {

let pool_box_scan = PoolBoxScan {
scan: Scan::new("Pool Box Scan", &scan_json["Pool Box Scan"].to_string()),
pool_box_wrapper_inputs: config.pool_box_wrapper_inputs.clone(),
pool_box_wrapper_inputs: &config.pool_box_wrapper_inputs,
};

let refresh_box_scan = RefreshBoxScan {
scan: Scan::new(
refresh_box_scan_name,
&scan_json[refresh_box_scan_name].to_string(),
),
refresh_box_wrapper_inputs,
refresh_box_wrapper_inputs: &config.refresh_box_wrapper_inputs,
};

let update_box_scan = UpdateBoxScan {
Expand All @@ -349,7 +333,7 @@ impl<'a> OraclePool<'a> {
contract_address: datapoint_contract_address.to_base16_bytes().unwrap(),
scan: datapoint_scan,
},
oracle_box_wrapper_inputs: config.oracle_box_wrapper_inputs.clone(),
oracle_box_wrapper_inputs: &config.oracle_box_wrapper_inputs,
},
local_oracle_datapoint_scan,
local_ballot_box_scan,
Expand Down Expand Up @@ -492,9 +476,9 @@ impl<'a> OraclePool<'a> {
}
}

impl PoolBoxSource for PoolBoxScan {
impl<'a> PoolBoxSource for PoolBoxScan<'a> {
fn get_pool_box(&self) -> Result<PoolBoxWrapper> {
let box_wrapper = PoolBoxWrapper::new(self.scan.get_box()?, &self.pool_box_wrapper_inputs)?;
let box_wrapper = PoolBoxWrapper::new(self.scan.get_box()?, self.pool_box_wrapper_inputs)?;
Ok(box_wrapper)
}
}
Expand All @@ -510,7 +494,7 @@ impl<'a> LocalBallotBoxSource for LocalBallotBoxScan<'a> {
}
}

impl RefreshBoxSource for RefreshBoxScan {
impl<'a> RefreshBoxSource for RefreshBoxScan<'a> {
fn get_refresh_box(&self) -> Result<RefreshBoxWrapper> {
let box_wrapper = RefreshBoxWrapper::new(
self.scan.get_box()?,
Expand All @@ -520,10 +504,10 @@ impl RefreshBoxSource for RefreshBoxScan {
}
}

impl LocalDatapointBoxSource for LocalOracleDatapointScan {
impl<'a> LocalDatapointBoxSource for LocalOracleDatapointScan<'a> {
fn get_local_oracle_datapoint_box(&self) -> Result<OracleBoxWrapper> {
let box_wrapper =
OracleBoxWrapper::new(self.scan.get_box()?, &self.oracle_box_wrapper_inputs)?;
OracleBoxWrapper::new(self.scan.get_box()?, self.oracle_box_wrapper_inputs)?;
Ok(box_wrapper)
}
}
Expand Down Expand Up @@ -582,13 +566,13 @@ impl StageDataSource for Stage {
}
}

impl DatapointBoxesSource for DatapointStage {
impl<'a> DatapointBoxesSource for DatapointStage<'a> {
fn get_oracle_datapoint_boxes(&self) -> Result<Vec<OracleBoxWrapper>> {
let res = self
.stage
.get_boxes()?
.into_iter()
.map(|b| OracleBoxWrapper::new(b, &self.oracle_box_wrapper_inputs).unwrap())
.map(|b| OracleBoxWrapper::new(b, self.oracle_box_wrapper_inputs).unwrap())
.collect();
Ok(res)
}
Expand Down

0 comments on commit 8a13625

Please sign in to comment.