Skip to content

Commit 7f00395

Browse files
committed
fix(test): rebase multi-gateway suite onto main
1 parent 5a60cd4 commit 7f00395

File tree

16 files changed

+1267
-1434
lines changed

16 files changed

+1267
-1434
lines changed

Cargo.lock

Lines changed: 470 additions & 445 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MACRO_TEST_CONVERSION_STATUS.md

Lines changed: 0 additions & 192 deletions
This file was deleted.

apps/freenet-ping/Cargo.lock

Lines changed: 20 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/freenet-ping/app/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ humantime = "2.2.0"
2626

2727
[dev-dependencies]
2828
freenet = { path = "../../../crates/core" }
29+
freenet-macros = { path = "../../../crates/freenet-macros" }
2930
testresult = { workspace = true }
3031

3132
[lib]

apps/freenet-ping/app/src/ping_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::collections::HashMap;
22
use std::time::{Duration, Instant};
33

4-
use chrono::{DateTime, Utc};
4+
use freenet_ping_types::chrono::{DateTime, Utc};
55
use freenet_ping_types::{Ping, PingContractOptions};
66
use freenet_stdlib::client_api::{
77
ClientRequest, ContractRequest, ContractResponse, HostResponse, WebApi,

apps/freenet-ping/app/tests/common/mod.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,18 +307,22 @@ fn compile_contract(contract_path: &PathBuf) -> anyhow::Result<Vec<u8>> {
307307
.map_err(|_| anyhow::anyhow!("CARGO_TARGET_DIR should be set"))?;
308308
println!("trying to compile the test contract, target: {target}");
309309

310-
compile_rust_wasm_lib(
311-
&BuildToolConfig {
312-
features: None,
313-
package_type: PackageType::Contract,
314-
debug: true,
315-
},
316-
contract_path,
317-
)?;
310+
let build_config = BuildToolConfig {
311+
features: None,
312+
package_type: PackageType::Contract,
313+
debug: false,
314+
};
315+
316+
compile_rust_wasm_lib(&build_config, contract_path)?;
318317

318+
let build_dir = if build_config.debug {
319+
"debug"
320+
} else {
321+
"release"
322+
};
319323
let output_file = Path::new(&target)
320324
.join(WASM_TARGET)
321-
.join("debug")
325+
.join(build_dir)
322326
.join(WASM_FILE_NAME.replace('-', "_"))
323327
.with_extension("wasm");
324328
println!("output file: {output_file:?}");

0 commit comments

Comments
 (0)