Skip to content

Remove as conversions from rust_oracle.rs #282

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 1 commit into from
Aug 31, 2022
Merged

Remove as conversions from rust_oracle.rs #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions program/rust/src/rust_oracle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,14 @@ pub fn upd_price(
let price_data = load_checked::<PriceAccount>(price_account, cmd_args.header.version)?;

// Verify that publisher is authorized
while publisher_index < price_data.num_ as usize {
while publisher_index < try_convert::<u32, usize>(price_data.num_)? {
if price_data.comp_[publisher_index].pub_ == *funding_account.key {
break;
}
publisher_index += 1;
}
pyth_assert(
publisher_index < price_data.num_ as usize,
publisher_index < try_convert::<u32, usize>(price_data.num_)?,
ProgramError::InvalidArgument,
)?;

Expand Down Expand Up @@ -445,7 +445,7 @@ pub fn init_price(
0,
size_of::<PriceInfo>(),
);
for i in 0..(price_data.comp_.len() as usize) {
for i in 0..price_data.comp_.len() {
sol_memset(
bytes_of_mut(&mut price_data.comp_[i].agg_),
0,
Expand Down Expand Up @@ -491,7 +491,7 @@ pub fn add_publisher(
return Err(ProgramError::InvalidArgument);
}

for i in 0..(price_data.num_ as usize) {
for i in 0..(try_convert::<u32, usize>(price_data.num_)?) {
if cmd_args.publisher == price_data.comp_[i].pub_ {
return Err(ProgramError::InvalidArgument);
}
Expand Down Expand Up @@ -537,9 +537,9 @@ pub fn del_publisher(

let mut price_data = load_checked::<PriceAccount>(price_account, cmd_args.header.version)?;

for i in 0..(price_data.num_ as usize) {
for i in 0..(try_convert::<u32, usize>(price_data.num_)?) {
if cmd_args.publisher == price_data.comp_[i].pub_ {
for j in i + 1..(price_data.num_ as usize) {
for j in i + 1..(try_convert::<u32, usize>(price_data.num_)?) {
price_data.comp_[j - 1] = price_data.comp_[j];
}
price_data.num_ -= 1;
Expand Down