Skip to content
Open
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
915 changes: 470 additions & 445 deletions Cargo.lock

Large diffs are not rendered by default.

192 changes: 0 additions & 192 deletions MACRO_TEST_CONVERSION_STATUS.md

This file was deleted.

30 changes: 20 additions & 10 deletions apps/freenet-ping/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions apps/freenet-ping/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ humantime = "2.2.0"

[dev-dependencies]
freenet = { path = "../../../crates/core" }
freenet-macros = { path = "../../../crates/freenet-macros" }
testresult = { workspace = true }

[lib]
Expand Down
2 changes: 1 addition & 1 deletion apps/freenet-ping/app/src/ping_client.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::time::{Duration, Instant};

use chrono::{DateTime, Utc};
use freenet_ping_types::chrono::{DateTime, Utc};
use freenet_ping_types::{Ping, PingContractOptions};
use freenet_stdlib::client_api::{
ClientRequest, ContractRequest, ContractResponse, HostResponse, WebApi,
Expand Down
22 changes: 13 additions & 9 deletions apps/freenet-ping/app/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,18 +307,22 @@ fn compile_contract(contract_path: &PathBuf) -> anyhow::Result<Vec<u8>> {
.map_err(|_| anyhow::anyhow!("CARGO_TARGET_DIR should be set"))?;
println!("trying to compile the test contract, target: {target}");

compile_rust_wasm_lib(
&BuildToolConfig {
features: None,
package_type: PackageType::Contract,
debug: true,
},
contract_path,
)?;
let build_config = BuildToolConfig {
features: None,
package_type: PackageType::Contract,
debug: false,
};

compile_rust_wasm_lib(&build_config, contract_path)?;

let build_dir = if build_config.debug {
"debug"
} else {
"release"
};
let output_file = Path::new(&target)
.join(WASM_TARGET)
.join("debug")
.join(build_dir)
.join(WASM_FILE_NAME.replace('-', "_"))
.with_extension("wasm");
println!("output file: {output_file:?}");
Expand Down
Loading
Loading