blockworks-foundation
/
pyth-crosschain
mirror of https://github.com/blockworks-foundation/pyth-crosschain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(target_chains/starknet): generalize array_try_into (#1555)

This commit is contained in:
Pavel Strakhov 2024-05-07 16:18:18 +01:00 committed by GitHub
parent e26c9d1a30
commit dd9b07b5e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target_chains/starknet/contracts/src/byte_array.cairo
View File

@ -73,7 +73,7 @@ pub impl ByteArrayImpl of ByteArrayTrait {
#[cfg(test)]
mod tests {
use super::{ByteArray, ByteArrayImpl};
use pyth::util::array_felt252_to_bytes31;
use pyth::util::array_try_into;
#[test]
fn empty_byte_array() {
@ -84,7 +84,7 @@ mod tests {
#[test]
fn byte_array_3_zeros() {
let mut array = ByteArrayImpl::new(array_felt252_to_bytes31(array![0]), 3);
let mut array = ByteArrayImpl::new(array_try_into(array![0]), 3);
assert!(array.len() == 3);
assert!(array.pop_front() == Option::Some((0.try_into().unwrap(), 3)));
assert!(array.len() == 0);
@ -93,7 +93,7 @@ mod tests {
#[test]
fn byte_array_3_bytes() {
let mut array = ByteArrayImpl::new(array_felt252_to_bytes31(array![0x010203]), 3);
let mut array = ByteArrayImpl::new(array_try_into(array![0x010203]), 3);
assert!(array.len() == 3);
assert!(array.pop_front() == Option::Some((0x010203.try_into().unwrap(), 3)));
assert!(array.len() == 0);
@ -103,7 +103,7 @@ mod tests {
#[test]
fn byte_array_single_full() {
let value_31_bytes = 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f;
let mut array = ByteArrayImpl::new(array_felt252_to_bytes31(array![value_31_bytes]), 31);
let mut array = ByteArrayImpl::new(array_try_into(array![value_31_bytes]), 31);
assert!(array.len() == 31);
assert!(array.pop_front() == Option::Some((value_31_bytes.try_into().unwrap(), 31)));
assert!(array.len() == 0);
@ -115,7 +115,7 @@ mod tests {
let value_31_bytes = 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f;
let value2_31_bytes = 0x2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f;
let mut array = ByteArrayImpl::new(
array_felt252_to_bytes31(array![value_31_bytes, value2_31_bytes]), 31
array_try_into(array![value_31_bytes, value2_31_bytes]), 31
);
assert!(array.len() == 62);
assert!(array.pop_front() == Option::Some((value_31_bytes.try_into().unwrap(), 31)));
@ -131,7 +131,7 @@ mod tests {
let value2_31_bytes = 0x2122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f;
let value3_5_bytes = 0x4142434445;
let mut array = ByteArrayImpl::new(
array_felt252_to_bytes31(array![value_31_bytes, value2_31_bytes, value3_5_bytes]), 5
array_try_into(array![value_31_bytes, value2_31_bytes, value3_5_bytes]), 5
);
assert!(array.len() == 67);
assert!(array.pop_front() == Option::Some((value_31_bytes.try_into().unwrap(), 31)));
@ -151,18 +151,18 @@ mod tests {
#[test]
#[should_panic]
fn byte_array_last_too_large() {
ByteArrayImpl::new(array_felt252_to_bytes31(array![1, 2, 3]), 35);
ByteArrayImpl::new(array_try_into(array![1, 2, 3]), 35);
}
#[test]
#[should_panic]
fn byte_array_last_zero_invalid() {
ByteArrayImpl::new(array_felt252_to_bytes31(array![1, 2, 0]), 0);
ByteArrayImpl::new(array_try_into(array![1, 2, 0]), 0);
}
#[test]
#[should_panic]
fn byte_array_last_too_many_bytes() {
ByteArrayImpl::new(array_felt252_to_bytes31(array![1, 2, 0x010203]), 2);
ByteArrayImpl::new(array_try_into(array![1, 2, 0x010203]), 2);
}
}

2
target_chains/starknet/contracts/src/util.cairo
View File

@ -134,7 +134,7 @@ pub fn u32_as_i32(value: u32) -> i32 {
}
}
pub fn array_felt252_to_bytes31(mut input: Array<felt252>) -> Array<bytes31> {
pub fn array_try_into<T, U, +TryInto<T, U>, +Drop<T>, +Drop<U>>(mut input: Array<T>) -> Array<U> {
let mut output = array![];
loop {
match input.pop_front() {

4
target_chains/starknet/contracts/tests/pyth.cairo
View File

@ -6,7 +6,7 @@ use pyth::pyth::{
IPythDispatcher, IPythDispatcherTrait, DataSource, Event as PythEvent, PriceFeedUpdateEvent
};
use pyth::byte_array::{ByteArray, ByteArrayImpl};
use pyth::util::{array_felt252_to_bytes31, UnwrapWithFelt252};
use pyth::util::{array_try_into, UnwrapWithFelt252};
use core::starknet::ContractAddress;
use openzeppelin::token::erc20::interface::{IERC20CamelDispatcher, IERC20CamelDispatcherTrait};
@ -170,5 +170,5 @@ fn good_update1() -> ByteArray {
226866843267230707879834616967256711063296411939069440476882347301771901839,
95752383404870925303422787,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 11)
ByteArrayImpl::new(array_try_into(bytes), 11)
}

12
target_chains/starknet/contracts/tests/wormhole.cairo
View File

@ -2,7 +2,7 @@ use snforge_std::{declare, ContractClassTrait, start_prank, stop_prank, CheatTar
use pyth::wormhole::{IWormholeDispatcher, IWormholeDispatcherTrait, ParseAndVerifyVmError};
use pyth::reader::ReaderImpl;
use pyth::byte_array::{ByteArray, ByteArrayImpl};
use pyth::util::{UnwrapWithFelt252, array_felt252_to_bytes31};
use pyth::util::{UnwrapWithFelt252, array_try_into};
use core::starknet::ContractAddress;
use core::panic_with_felt252;
@ -322,7 +322,7 @@ fn good_vm1() -> ByteArray {
52685537088250779930155363779405986390839624071318818148325576008719597568,
14615204155786886573933667335033405822686404253588533,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 22)
ByteArrayImpl::new(array_try_into(bytes), 22)
}
const CHAIN_ID: u16 = 1;
@ -352,7 +352,7 @@ fn governance_upgrade_vm1() -> ByteArray {
55852237138651071644815135002358067220635692701051811455610533875912981641,
190413173566657072516608762222993749133,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 16)
ByteArrayImpl::new(array_try_into(bytes), 16)
}
fn governance_upgrade_vm2() -> ByteArray {
@ -402,7 +402,7 @@ fn governance_upgrade_vm2() -> ByteArray {
75218391584551901010047495874303520775865073092730040058902770251005073864,
13453,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 2)
ByteArrayImpl::new(array_try_into(bytes), 2)
}
fn governance_upgrade_vm3() -> ByteArray {
@ -452,7 +452,7 @@ fn governance_upgrade_vm3() -> ByteArray {
75218391584551901010047495874303520775865073092730040058902770251005073864,
13453,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 2)
ByteArrayImpl::new(array_try_into(bytes), 2)
}
fn governance_upgrade_vm4() -> ByteArray {
@ -502,5 +502,5 @@ fn governance_upgrade_vm4() -> ByteArray {
75218391584551901010047495874303520775865073092730040058902770251005073864,
13453,
];
ByteArrayImpl::new(array_felt252_to_bytes31(bytes), 2)
ByteArrayImpl::new(array_try_into(bytes), 2)
}