Skip to content

Gate sma with test flag #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2022
Merged

Gate sma with test flag #295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c68a70b
Gate sma with test flag
guibescos Sep 22, 2022
702b66e
Restore current gating
guibescos Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions program/rust/src/rust_oracle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,16 @@ pub fn resize_price_account(

// Check that everything is ok
check_valid_signable_account(program_id, price_account_info)?;
let mut price_account =
load_checked::<PriceAccountWrapper>(price_account_info, PC_VERSION)?;
// Initialize Time Machine
price_account.initialize_time_machine()?;

#[cfg(test)]
// Sma feature disabled except in tests
{
let mut price_account =
load_checked::<PriceAccountWrapper>(price_account_info, PC_VERSION)?;
// Initialize Time Machine
price_account.initialize_time_machine()?;
}

Ok(())
}
PriceAccountWrapper::MINIMUM_SIZE => Ok(()),
Expand Down Expand Up @@ -251,8 +257,10 @@ pub fn upd_price(
}

// Try to update the aggregate
#[allow(unused_variables)]
let mut aggregate_updated = false;
if clock.slot > latest_aggregate_price.pub_slot_ {
#[allow(unused_assignments)]
unsafe {
aggregate_updated = c_upd_aggregate(
price_account.try_borrow_mut_data()?.as_mut_ptr(),
Expand All @@ -262,11 +270,15 @@ pub fn upd_price(
}
}

let account_len = price_account.try_data_len()?;
if aggregate_updated && account_len == PriceAccountWrapper::MINIMUM_SIZE {
let mut price_account =
load_checked::<PriceAccountWrapper>(price_account, cmd_args.header.version)?;
price_account.add_price_to_time_machine()?;
#[cfg(test)]
// Sma feature disabled in production for now
{
let account_len = price_account.try_data_len()?;
if aggregate_updated && account_len == PriceAccountWrapper::MINIMUM_SIZE {
let mut price_account =
load_checked::<PriceAccountWrapper>(price_account, cmd_args.header.version)?;
price_account.add_price_to_time_machine()?;
}
}

// Try to update the publisher's price
Expand Down