Skip to content
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.

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

sc upgrade #15

Merged
merged 2 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions ping-pong/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ publish = false
[lib]
path = "src/ping_pong.rs"
[dependencies.multiversx-sc]
version = "0.39.5"

version = "0.42.0"
[dev-dependencies.multiversx-sc-scenario]
version = "0.39.5"
version = "0.42.0"
2 changes: 1 addition & 1 deletion ping-pong/meta/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ publish = false
path = ".."

[dependencies.multiversx-sc-meta]
version = "0.39.5"
version = "0.42.0"
24 changes: 15 additions & 9 deletions ping-pong/tests/ping_pong_egld_scenario_go_test.rs
Original file line number Diff line number Diff line change
@@ -1,44 +1,50 @@
use multiversx_sc_scenario::*;

fn world() -> ScenarioWorld {
ScenarioWorld::vm_go()
}

#[test]
fn ping_pong_call_ping_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping.scen.json");
world().run("scenarios/ping-pong-call-ping.scen.json");
}

#[test]
fn ping_pong_call_ping_second_user_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-second-user.scen.json");
world().run("scenarios/ping-pong-call-ping-second-user.scen.json");
}

#[test]
fn ping_pong_call_ping_twice_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-twice.scen.json");
world().run("scenarios/ping-pong-call-ping-twice.scen.json");
}

#[test]
fn ping_pong_call_ping_wrong_amount_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-wrong-amount.scen.json");
world().run("scenarios/ping-pong-call-ping-wrong-amount.scen.json");
}

#[test]
fn ping_pong_call_pong_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong.scen.json");
world().run("scenarios/ping-pong-call-pong.scen.json");
}

#[test]
fn ping_pong_call_pong_before_deadline_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-before-deadline.scen.json");
world().run("scenarios/ping-pong-call-pong-before-deadline.scen.json");
}

#[test]
fn ping_pong_call_pong_twice_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-twice.scen.json");
world().run("scenarios/ping-pong-call-pong-twice.scen.json");
}

#[test]
fn ping_pong_call_pong_without_ping_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-without-ping.scen.json");
world().run("scenarios/ping-pong-call-pong-without-ping.scen.json");
}

#[test]
fn ping_pong_init_go() {
multiversx_sc_scenario::run_go("mandos/ping-pong-init.scen.json");
world().run("scenarios/ping-pong-init.scen.json");
}
21 changes: 9 additions & 12 deletions ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,45 @@ fn world() -> ScenarioWorld {

#[test]
fn ping_pong_call_ping_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping.scen.json", world());
world().run("scenarios/ping-pong-call-ping.scen.json");
}

#[test]
fn ping_pong_call_ping_second_user_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-second-user.scen.json", world());
world().run("scenarios/ping-pong-call-ping-second-user.scen.json");
}

#[test]
fn ping_pong_call_ping_twice_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-twice.scen.json", world());
world().run("scenarios/ping-pong-call-ping-twice.scen.json");
}

#[test]
fn ping_pong_call_ping_wrong_amount_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-wrong-amount.scen.json", world());
world().run("scenarios/ping-pong-call-ping-wrong-amount.scen.json");
}

#[test]
fn ping_pong_call_pong_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong.scen.json", world());
world().run("scenarios/ping-pong-call-pong.scen.json");
}

#[test]
fn ping_pong_call_pong_before_deadline_rs() {
multiversx_sc_scenario::run_rs(
"mandos/ping-pong-call-pong-before-deadline.scen.json",
world(),
);
world().run("scenarios/ping-pong-call-pong-before-deadline.scen.json");
}

#[test]
fn ping_pong_call_pong_twice_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong-twice.scen.json", world());
world().run("scenarios/ping-pong-call-pong-twice.scen.json");
}

#[test]
fn ping_pong_call_pong_without_ping_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong-without-ping.scen.json", world());
world().run("scenarios/ping-pong-call-pong-without-ping.scen.json");
}

#[test]
fn ping_pong_init_rs() {
multiversx_sc_scenario::run_rs("mandos/ping-pong-init.scen.json", world());
world().run("scenarios/ping-pong-init.scen.json");
}
2 changes: 1 addition & 1 deletion ping-pong/wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ panic = "abort"
path = ".."

[dependencies.multiversx-sc-wasm-adapter]
version = "0.39.5"
version = "0.42.0"
23 changes: 12 additions & 11 deletions ping-pong/wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,25 @@
// Total number of exported functions: 11

#![no_std]
#![feature(alloc_error_handler, lang_items)]
#![feature(lang_items)]

multiversx_sc_wasm_adapter::allocator!();
multiversx_sc_wasm_adapter::panic_handler!();

multiversx_sc_wasm_adapter::endpoints! {
ping_pong
(
ping
pong
didUserPing
getPongEnableTimestamp
getTimeToPong
getAcceptedPaymentToken
getPingAmount
getDurationTimestamp
getUserPingTimestamp
init => init
ping => ping
pong => pong
didUserPing => did_user_ping
getPongEnableTimestamp => get_pong_enable_timestamp
getTimeToPong => get_time_to_pong
getAcceptedPaymentToken => accepted_payment_token_id
getPingAmount => ping_amount
getDurationTimestamp => duration_in_seconds
getUserPingTimestamp => user_ping_timestamp
)
}

multiversx_sc_wasm_adapter::empty_callback! {}
multiversx_sc_wasm_adapter::async_callback_empty! {}
Loading