Fixup for golang extension

loopholelabs · Sep 22, 2023 · 023eaf5 · 023eaf5
1 parent 6dbb46a
commit 023eaf5
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 14 deletions.
diff --git a/extension/generator/golang/generated.txt b/extension/generator/golang/generated.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature v0.3.20, DO NOT EDIT.
+// Code generated by scale-signature v0.4.1, DO NOT EDIT.
 // output: types
 
 package types

diff --git a/extension/generator/golang/generator_test.go b/extension/generator/golang/generator_test.go
@@ -42,29 +42,29 @@ func TestGenerator(t *testing.T) {
 
 	formatted, err := GenerateTypes(s, "types")
 	require.NoError(t, err)
-	//  os.WriteFile("./generated.txt", formatted, 0644)
+	//	os.WriteFile("./generated.txt", formatted, 0644)
 
 	expTypes, err := os.ReadFile("./generated.txt")
 	require.NoError(t, err)
 	require.Equal(t, string(expTypes), string(formatted))
 
 	host, err := GenerateHost(s, packageName, "v0.1.0")
 	require.NoError(t, err)
-	//  os.WriteFile("./host.txt", host, 0644)
+	//	os.WriteFile("./host.txt", host, 0644)
 	expHost, err := os.ReadFile("./host.txt")
 	require.NoError(t, err)
 	require.Equal(t, string(expHost), string(host))
 
 	guest, err := GenerateGuest(s, packageName, "v0.1.0")
 	require.NoError(t, err)
-	//  os.WriteFile("./guest.txt", guest, 0644)
+	//	os.WriteFile("./guest.txt", guest, 0644)
 	expGuest, err := os.ReadFile("./guest.txt")
 	require.NoError(t, err)
 	require.Equal(t, string(expGuest), string(guest))
 
 	mod, err := GenerateModfile(packageName)
 	require.NoError(t, err)
-	// os.WriteFile("./modfile.txt", mod, 0644)
+	//	os.WriteFile("./modfile.txt", mod, 0644)
 	expMod, err := os.ReadFile("./modfile.txt")
 	require.NoError(t, err)
 	require.Equal(t, string(expMod), string(mod))

diff --git a/extension/generator/golang/guest.txt b/extension/generator/golang/guest.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go v0.1.0, DO NOT EDIT.
+// Code generated by scale-extension v0.1.0, DO NOT EDIT.
 // schema: HttpFetch:alpha
 // output: extfetch
 

diff --git a/extension/generator/golang/host.txt b/extension/generator/golang/host.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go v0.1.0, DO NOT EDIT.
+// Code generated by scale-extension v0.1.0, DO NOT EDIT.
 // schema: HttpFetch:alpha
 // output: extfetch
 
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/loopholelabs/scale/extension"
+	extension "github.com/loopholelabs/scale-extension-interfaces"
 )
 
 const identifier = "HttpFetch:alpha"
@@ -47,7 +47,7 @@ func (he *hostExt) Reset() {
 
 }
 
-func New(impl HttpFetchIfc) extension.HostExtension {
+func New(impl HttpFetchIfc) extension.Extension {
 	hostWrapper := &HttpFetchHost{impl: impl}
 
 	fns := make(map[string]extension.InstallableFunc)

diff --git a/extension/generator/golang/interfaces.txt b/extension/generator/golang/interfaces.txt
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go v0.1.0, DO NOT EDIT.
+// Code generated by scale-extension v0.1.0, DO NOT EDIT.
 // schema: HttpFetch:alpha
 // output: extfetch
 

diff --git a/extension/generator/golang/modfile.txt b/extension/generator/golang/modfile.txt
@@ -4,5 +4,5 @@ go 1.20
 
 require (
     github.com/loopholelabs/polyglot v1.1.3
-    github.com/loopholelabs/scale-signature-interfaces v0.1.7
+    github.com/loopholelabs/scale-extension-interfaces v0.1.0
 )
diff --git a/extension/generator/golang/templates/guest.go.templ b/extension/generator/golang/templates/guest.go.templ
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go {{ .version }}, DO NOT EDIT.
+// Code generated by scale-extension {{ .version }}, DO NOT EDIT.
 // schema: {{ .schema.Name }}:{{ .schema.Tag }}
 // output: {{ .package }}
 

diff --git a/extension/generator/golang/templates/host.go.templ b/extension/generator/golang/templates/host.go.templ
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go {{ .version }}, DO NOT EDIT.
+// Code generated by scale-extension {{ .version }}, DO NOT EDIT.
 // schema: {{ .schema.Name }}:{{ .schema.Tag }}
 // output: {{ .package }}
 

diff --git a/extension/generator/golang/templates/interfaces.go.templ b/extension/generator/golang/templates/interfaces.go.templ
@@ -1,4 +1,4 @@
-// Code generated by scale-signature-go {{ .version }}, DO NOT EDIT.
+// Code generated by scale-extension {{ .version }}, DO NOT EDIT.
 // schema: {{ .schema.Name }}:{{ .schema.Tag }}
 // output: {{ .package }}
 

diff --git a/storage/extension.go b/storage/extension.go
@@ -297,6 +297,11 @@ func GenerateExtension(ext *extension.Schema, name string, tag string, org strin
 		return err
 	}
 
+	err = os.MkdirAll(path.Join(directory, "rust", "guest"), 0755)
+	if err != nil {
+		return err
+	}
+
 	err = os.MkdirAll(path.Join(directory, "golang", "host"), 0755)
 	if err != nil {
 		return err
@@ -322,6 +327,13 @@ func GenerateExtension(ext *extension.Schema, name string, tag string, org strin
 		}
 	}
 
+	for _, file := range guestPackage.RustFiles {
+		err = os.WriteFile(path.Join(directory, "rust", "guest", file.Path()), file.Data(), 0644)
+		if err != nil {
+			return err
+		}
+	}
+
 	hostPackage, err := generator.GenerateHostLocal(&generator.Options{
 		Extension:               ext,
 		GolangPackageImportPath: "extension",