Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

wasm-rpc-version-override flag and fix the build subcommand #76

Merged
merged 4 commits into from
Aug 21, 2024
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
100 changes: 19 additions & 81 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion wasm-rpc-stubgen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ quote = "1.0.36"
regex = "1.10.4"
serde = { version = "1.0.203", features = ["derive"] }
syn = "2.0.66"
tempdir = "0.3.7"
tempfile = "3.12.0"
tokio = "1.38.0"
toml = "0.8.14"
wasm-compose = "0.207.0"
Expand Down
10 changes: 7 additions & 3 deletions wasm-rpc-stubgen/src/cargo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,16 @@ pub fn generate_cargo_toml(def: &StubDefinition) -> anyhow::Result<()> {
}));

let dep_golem_wasm_rpc = Dependency::Detailed(Box::new(DependencyDetail {
version: if def.wasm_rpc_path_override.is_none() {
Some(WASM_RPC_VERSION.to_string())
version: if def.wasm_rpc_override.wasm_rpc_path_override.is_none() {
if let Some(version) = def.wasm_rpc_override.wasm_rpc_version_override.as_ref() {
Some(version.to_string())
} else {
Some(WASM_RPC_VERSION.to_string())
}
} else {
None
},
path: def.wasm_rpc_path_override.clone(),
path: def.wasm_rpc_override.wasm_rpc_path_override.clone(),
default_features: false,
features: vec!["stub".to_string()],
..Default::default()
Expand Down
2 changes: 1 addition & 1 deletion wasm-rpc-stubgen/src/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub async fn compile(root: &Path) -> anyhow::Result<()> {
..Default::default()
};

let config = Config::new(Terminal::new(Verbosity::Normal, Color::Auto))?;
let config = Config::new(Terminal::new(Verbosity::Verbose, Color::Auto))?;

let metadata = load_metadata(cargo_args.manifest_path.as_deref())?;
let packages =
Expand Down
Loading
Loading