Fix schema generation. (#76)

* Fix schema generation. * Fix project initialization.
odradev · Feb 6, 2024 · 99c4d7e · 99c4d7e
1 parent f06dd3d
commit 99c4d7e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/ci-cargo-odra.yml b/.github/workflows/ci-cargo-odra.yml
@@ -32,7 +32,7 @@ jobs:
       - run: just prepare
       - run: just check-lint
       - run: just install
-      - run: just test-project-generation-on-future-odra
-      - run: just test-workspace-generation-on-future-odra
-#      - run: just test-project-generation-on-stable-odra
-#      - run: just test-workspace-generation-on-stable-odra
+# - run: just test-project-generation-on-future-odra
+# - run: just test-workspace-generation-on-future-odra
+      - run: just test-project-generation-on-stable-odra
+      - run: just test-workspace-generation-on-stable-odra
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /target
-.idea
 testproject
 Cargo.lock
+.*
+!/.gitignore
diff --git a/src/actions/init.rs b/src/actions/init.rs
@@ -162,10 +162,7 @@ impl InitAction {
             // version
             let version_regex = regex::Regex::new(r"^\d+\.\d+\.\d+$").unwrap();
             if version_regex.is_match(&source) {
-                OdraLocation::Remote(
-                    ODRA_TEMPLATE_GH_REPO.to_string(),
-                    Some(format!("release/{}", source)),
-                )
+                OdraLocation::CratesIO(source)
             } else {
                 // branch
                 OdraLocation::Remote(ODRA_TEMPLATE_GH_REPO.to_string(), Some(source))

diff --git a/src/actions/schema.rs b/src/actions/schema.rs
@@ -38,7 +38,7 @@ impl SchemaAction<'_> {
             command::cargo_generate_schema_files(
                 self.project.project_root(),
                 &contract.struct_name(),
-                &contract.module_name(),
+                &contract.crate_name(self.project),
             );
         }
     }