Skip to content

Commit

Permalink
fix(tests): update tests for chain id
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwiss
kwiss committed Jan 17, 2024
1 parent bfc0c44 commit 3b111a0
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 67 deletions.
48 changes: 28 additions & 20 deletions contracts/ark_orderbook/tests/common/setup.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@ use super::super::common::signer::sign_mock;
/// * order_auction - An auction order of type OrderV1
/// * order_collection_offer - An offer order of type OrderV1 for a collection
///

fn setup_orders() -> (OrderV1, OrderV1, OrderV1, OrderV1,) {
let data = array![];
let data_span = data.span();
let chain_id = 0x534e5f4d41494e;

let order_listing = OrderV1 {
route: RouteType::Erc721ToErc20.into(),
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand All @@ -49,12 +51,12 @@ fn setup_orders() -> (OrderV1, OrderV1, OrderV1, OrderV1,) {
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand All @@ -72,12 +74,12 @@ fn setup_orders() -> (OrderV1, OrderV1, OrderV1, OrderV1,) {
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 0,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand All @@ -96,12 +98,12 @@ fn setup_orders() -> (OrderV1, OrderV1, OrderV1, OrderV1,) {
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 0,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand Down Expand Up @@ -129,6 +131,7 @@ fn setup_offer(
start_date: u64, end_date: u64, pk: Option<felt252>, token_id: Option<u256>
) -> (OrderV1, Signer, felt252, felt252) {
let mut _token_id = 10;
let chain_id = 0x534e5f4d41494e;
if token_id.is_some() {
_token_id = token_id.unwrap();
}
Expand All @@ -143,10 +146,10 @@ fn setup_offer(
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: offerer,
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand Down Expand Up @@ -180,17 +183,18 @@ fn setup_listing_order(price: felt252) -> (OrderV1, felt252, felt252) {
let end_date = block_timestamp + (30 * 24 * 60 * 60);
let data = array![];
let data_span = data.span();
let chain_id = 0x534e5f4d41494e;
let order_listing = OrderV1 {
route: RouteType::Erc721ToErc20.into(),
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand Down Expand Up @@ -221,18 +225,19 @@ fn setup_listing_order_with_sign() -> (OrderV1, SignInfo, felt252, felt252) {
let block_timestamp = starknet::get_block_timestamp();
let end_date = block_timestamp + (30 * 24 * 60 * 60);
let data = array![];
let chain_id = 0x534e5f4d41494e;
let data_span = data.span();
let order_listing = OrderV1 {
route: RouteType::Erc721ToErc20.into(),
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand Down Expand Up @@ -266,16 +271,17 @@ fn setup_auction_order(
.try_into()
.unwrap();
let data = array![];
let chain_id = 0x534e5f4d41494e;
let data_span = data.span();
let order_listing = OrderV1 {
route: RouteType::Erc721ToErc20.into(),
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: offerer,
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand All @@ -301,6 +307,7 @@ fn setup_listing(
) -> (OrderV1, Signer, felt252, felt252) {
let data = array![];
let data_span = data.span();
let chain_id = 0x534e5f4d41494e;
let offerer = 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap();
Expand All @@ -309,10 +316,10 @@ fn setup_listing(
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 1,
offerer: offerer,
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand All @@ -334,17 +341,18 @@ fn setup_listing(
fn get_offer_order() -> OrderV1 {
let data = array![];
let data_span = data.span();
let chain_id = 0x534e5f4d41494e;
OrderV1 {
route: RouteType::Erc20ToErc721.into(),
currency_address: 0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7
.try_into()
.unwrap(),
currency_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
currency_chain_id: chain_id,
salt: 0,
offerer: 0x2284a6517b487be8114013f277f9e2010ac001a24a93e3c48cdf5f8f345a81b
.try_into()
.unwrap(),
token_chain_id: 0x534e5f4d41494e.try_into().unwrap(),
token_chain_id: chain_id,
token_address: 0x01435498bf393da86b4733b9264a86b58a42b31f8d8b8ba309593e5c17847672
.try_into()
.unwrap(),
Expand Down
20 changes: 16 additions & 4 deletions contracts/ark_orderbook/tests/integration/test_cancel_order.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ fn test_cancel_auction() {
);

let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();

let dispatcher = OrderbookDispatcher { contract_address };
Expand Down Expand Up @@ -59,7 +62,10 @@ fn test_cancel_non_existing_order() {
.try_into()
.unwrap();
let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();
let cancel_info = CancelInfo {
order_hash: order_hash,
Expand Down Expand Up @@ -87,7 +93,10 @@ fn test_invalid_cancel_auction_order() {
);

let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();

let dispatcher = OrderbookDispatcher { contract_address };
Expand Down Expand Up @@ -123,7 +132,10 @@ fn test_cancel_auction_during_the_extended_time() {
);

let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();
let dispatcher = OrderbookDispatcher { contract_address };
dispatcher.create_order(order: auction_listing_order, signer: auction_listing_signer);
Expand Down
12 changes: 8 additions & 4 deletions contracts/ark_orderbook/tests/integration/test_create_auction_offers.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ fn test_create_valid_auction_offer() {
let (auction_listing_order, signer, order_hash, token_hash) = setup_auction_order(
start_date, end_date, 1, 10, Option::None
);

let chain_id = 0x534e5f4d41494e;
let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();

let dispatcher = OrderbookDispatcher { contract_address };
Expand All @@ -43,9 +45,11 @@ fn test_accept_auction_after_expiration() {
let (auction_listing_order, signer, order_hash, token_hash) = setup_auction_order(
start_date, end_date, 1, 10, Option::None
);

let chain_id = 0x534e5f4d41494e;
let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();

let dispatcher = OrderbookDispatcher { contract_address };
Expand Down
15 changes: 12 additions & 3 deletions contracts/ark_orderbook/tests/integration/test_create_listing_order.cairo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ fn test_create_existing_order() {
start_date, end_date, Option::Some(123)
);
let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();
let dispatcher = OrderbookDispatcher { contract_address };
dispatcher.create_order(order: order_listing, signer: signer);
Expand All @@ -39,7 +42,10 @@ fn test_create_listing_order() {
start_date, end_date, Option::Some(10)
);
let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();
let dispatcher = OrderbookDispatcher { contract_address };
dispatcher.create_order(order: order_listing, signer: signer);
Expand Down Expand Up @@ -92,7 +98,10 @@ fn test_auction_order_with_extended_time_order() {
);

let contract = declare('orderbook');
let contract_data = array![0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078];
let chain_id = 0x534e5f4d41494e;
let contract_data = array![
0x00E4769a4d2F7F69C70951A003eBA5c32707Cef3CdfB6B27cA63567f51cdd078, chain_id
];
let contract_address = contract.deploy(@contract_data).unwrap();

let dispatcher = OrderbookDispatcher { contract_address };
Expand Down
Loading

0 comments on commit 3b111a0

Please sign in to comment.