Updated Odra branch constant.

odradev · Jun 17, 2024 · 9db54ed · 9db54ed
1 parent b633e90
commit 9db54ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/justfile b/justfile
@@ -1,4 +1,4 @@
-DEVELOPMENT_ODRA_BRANCH := "release/1.0.0"
+DEVELOPMENT_ODRA_BRANCH := "release/1.1.0"
 BINARYEN_VERSION := "version_116"
 BINARYEN_CHECKSUM := "c55b74f3109cdae97490faf089b0286d3bba926bb6ea5ed00c8c784fc53718fd"
 

diff --git a/src/actions/build.rs b/src/actions/build.rs
@@ -49,7 +49,9 @@ impl BuildAction<'_> {
                 &contract.struct_name(),
                 &module_name,
                 self.project.is_workspace(),
+                contract.module_crate_name(self.project),
             );
+
             let source = paths::wasm_path_in_target(&build_contract, self.project.project_root());
             let target =
                 paths::wasm_path_in_wasm_dir(&contract.struct_name(), &self.project.project_root());
@@ -63,7 +65,7 @@ impl BuildAction<'_> {
                     .join(contract.module_crate_name(self.project))
                     .join("wasm");
                 command::mkdir(module_wasm_dir.clone());
-                let mut module_wasm_path = module_wasm_dir.clone().join(&contract.struct_name());
+                let mut module_wasm_path = module_wasm_dir.clone().join(contract.struct_name());
                 module_wasm_path.set_extension("wasm");
                 log::info(format!("Copying to {}", module_wasm_path.display()));
                 command::cp(source, module_wasm_path);

diff --git a/src/command.rs b/src/command.rs
@@ -124,6 +124,7 @@ pub fn cargo_build_wasm_files(
     contract_name: &str,
     module_name: &str,
     is_workspace: bool,
+    crate_name: String,
 ) {
     env::set_var(ODRA_MODULE_ENV_KEY, contract_name);
     let build_contract = format!("{}_build_contract", module_name);
@@ -136,7 +137,7 @@ pub fn cargo_build_wasm_files(
     ];
     if is_workspace {
         params.push("--package");
-        params.push(module_name);
+        params.push(crate_name.as_str());
     }
     cargo(current_dir, "build", params);
 }