From 9a38b83302108779ac22f08066498cab43751f42 Mon Sep 17 00:00:00 2001
From: Shivansh Vij <shivanshvij@loopholelabs.io>
Date: Mon, 28 Aug 2023 02:10:36 -0700
Subject: [PATCH] Fixing bugs in rust crates where the name of the crates would
 not be valid

---
 build/build.go                                  |  4 ++--
 integration/generate_test.go                    |  2 +-
 integration/golang_tests/signature/go.mod       | 13 ++++++++++---
 integration/rust_tests/generated/generated.rs   |  2 +-
 integration/rust_tests/signature/tests/types.rs |  4 ++--
 signature/generator/rust/generator.go           |  4 ++--
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build/build.go b/build/build.go
index d2e0d8a4..ba6d16c1 100644
--- a/build/build.go
+++ b/build/build.go
@@ -225,7 +225,7 @@ func LocalGolang(options *LocalGolangOptions) (*scalefunc.Schema, error) {
 	case WASITarget:
 		target = "wasi"
 	default:
-		return nil, fmt.Errorf("unknown build target %s", options.Target)
+		return nil, fmt.Errorf("unknown build target %d", options.Target)
 	}
 
 	buildArgs := append([]string{"build", "-o", "scale.wasm"}, options.Args...)
@@ -387,7 +387,7 @@ func LocalRust(options *LocalRustOptions) (*scalefunc.Schema, error) {
 	case WASITarget:
 		target = "wasm32-wasi"
 	default:
-		return nil, fmt.Errorf("unknown build target %s", options.Target)
+		return nil, fmt.Errorf("unknown build target %d", options.Target)
 	}
 
 	buildArgs := append([]string{"build"}, options.Args...)
diff --git a/integration/generate_test.go b/integration/generate_test.go
index 2ddc1f9f..84887089 100644
--- a/integration/generate_test.go
+++ b/integration/generate_test.go
@@ -62,7 +62,7 @@ func TestGenerateMasterTestingSchema(t *testing.T) {
 		GolangPolyglotVersion: version.Version(),
 
 		RustPackageName:     "local_example_latest_guest",
-		RustPackageVersion:  "0.1.0",
+		RustPackageVersion:  "v0.1.0",
 		RustPolyglotVersion: strings.TrimPrefix(version.Version(), "v"),
 	})
 	require.NoError(t, err)
diff --git a/integration/golang_tests/signature/go.mod b/integration/golang_tests/signature/go.mod
index 7bdc680b..6705274d 100644
--- a/integration/golang_tests/signature/go.mod
+++ b/integration/golang_tests/signature/go.mod
@@ -3,6 +3,13 @@ module signature
 go 1.20
 
 require (
-    github.com/loopholelabs/polyglot v1.1.2
-    
-)
\ No newline at end of file
+	github.com/loopholelabs/polyglot v1.1.2
+	github.com/stretchr/testify v1.8.4
+
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/integration/rust_tests/generated/generated.rs b/integration/rust_tests/generated/generated.rs
index cbce874d..3d4c03a1 100644
--- a/integration/rust_tests/generated/generated.rs
+++ b/integration/rust_tests/generated/generated.rs
@@ -1,4 +1,4 @@
-// Code generated by scale-signature v0.1.0, DO NOT EDIT.
+// Code generated by scale-signature 0.1.0, DO NOT EDIT.
 // output: generated
 
 #![allow(dead_code)]
diff --git a/integration/rust_tests/signature/tests/types.rs b/integration/rust_tests/signature/tests/types.rs
index de7cf420..596f098d 100644
--- a/integration/rust_tests/signature/tests/types.rs
+++ b/integration/rust_tests/signature/tests/types.rs
@@ -3,8 +3,8 @@ mod tests {
     use std::fs;
     use std::error::Error;
     use std::io::{Cursor, Seek, SeekFrom};
-    use signature::types;
-    use signature::types::{Encode, Decode};
+    use local_example_latest_guest::types;
+    use local_example_latest_guest::types::{Encode, Decode};
 
     #[test]
     fn test_output() -> Result<(), Box<dyn Error>> {
diff --git a/signature/generator/rust/generator.go b/signature/generator/rust/generator.go
index 333b342f..9c4f8137 100644
--- a/signature/generator/rust/generator.go
+++ b/signature/generator/rust/generator.go
@@ -77,7 +77,7 @@ func (g *Generator) Generate(schema *signature.Schema, packageName string, scale
 	buf := new(bytes.Buffer)
 	err := g.templ.ExecuteTemplate(buf, "types.rs.templ", map[string]any{
 		"schema":  schema,
-		"version": scaleVersion,
+		"version": strings.TrimPrefix(scaleVersion, "v"),
 		"package": packageName,
 	})
 	if err != nil {
@@ -102,7 +102,7 @@ func (g *Generator) GenerateCargofile(packageName string, packageVersion string,
 		"scale_version":    strings.TrimPrefix(scaleVersion, "v"),
 		"polyglot_version": strings.TrimPrefix(polyglotVersion, "v"),
 		"package":          packageName,
-		"version":          packageVersion,
+		"version":          strings.TrimPrefix(packageVersion, "v"),
 	})
 	if err != nil {
 		return nil, err