Couple changes

Signed-off-by: Jimmy Moore <[email protected]>
loopholelabs · Sep 19, 2023 · 7ad49d2 · 7ad49d2
1 parent 845afa7
commit 7ad49d2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/extension/generator/generator.go b/extension/generator/generator.go
@@ -15,7 +15,6 @@ package generator
 
 import (
 	"bytes"
-	"encoding/hex"
 
 	"github.com/loopholelabs/scale/extension"
 	"github.com/loopholelabs/scale/extension/generator/golang"
@@ -57,28 +56,28 @@ type Options struct {
 }
 
 func GenerateGuestLocal(options *Options) (*GuestLocalPackage, error) {
-	hash, err := options.Extension.Hash()
-	if err != nil {
-		return nil, err
-	}
-	hashString := hex.EncodeToString(hash)
+	//	hash, err := options.Extension.Hash()
+	//	if err != nil {
+	//		return nil, err
+	//	}
+	//	hashString := hex.EncodeToString(hash)
 
 	golangTypes, err := golang.GenerateTypes(options.Extension, options.GolangPackageName)
 	if err != nil {
 		return nil, err
 	}
 
-	golangGuest, err := golang.GenerateGuest(options.Extension, hashString, options.GolangPackageName)
+	golangGuest, err := golang.GenerateGuest(options.Extension, options.GolangPackageName, options.GolangPackageVersion)
 	if err != nil {
 		return nil, err
 	}
 
-	golangInterfaces, err := golang.GenerateInterfaces(options.Extension, hashString, options.GolangPackageName)
+	golangInterfaces, err := golang.GenerateInterfaces(options.Extension, options.GolangPackageName, options.GolangPackageVersion)
 	if err != nil {
 		return nil, err
 	}
 
-	modfile, err := golang.GenerateModfile(options.GolangPackageImportPath)
+	modfile, err := golang.GenerateModfile(options.GolangPackageName)
 	if err != nil {
 		return nil, err
 	}
@@ -96,28 +95,28 @@ func GenerateGuestLocal(options *Options) (*GuestLocalPackage, error) {
 }
 
 func GenerateHostLocal(options *Options) (*HostLocalPackage, error) {
-	hash, err := options.Extension.Hash()
-	if err != nil {
-		return nil, err
-	}
-	hashString := hex.EncodeToString(hash)
+	//hash, err := options.Extension.Hash()
+	//if err != nil {
+	//	return nil, err
+	//}
+	//hashString := hex.EncodeToString(hash)
 
 	golangTypes, err := golang.GenerateTypes(options.Extension, options.GolangPackageName)
 	if err != nil {
 		return nil, err
 	}
 
-	golangHost, err := golang.GenerateHost(options.Extension, hashString, options.GolangPackageName)
+	golangHost, err := golang.GenerateHost(options.Extension, options.GolangPackageName, options.GolangPackageVersion)
 	if err != nil {
 		return nil, err
 	}
 
-	golangInterfaces, err := golang.GenerateInterfaces(options.Extension, hashString, options.GolangPackageName)
+	golangInterfaces, err := golang.GenerateInterfaces(options.Extension, options.GolangPackageName, options.GolangPackageVersion)
 	if err != nil {
 		return nil, err
 	}
 
-	modfile, err := golang.GenerateModfile(options.GolangPackageImportPath)
+	modfile, err := golang.GenerateModfile(options.GolangPackageName)
 	if err != nil {
 		return nil, err
 	}

diff --git a/storage/extension.go b/storage/extension.go
@@ -281,8 +281,8 @@ func (s *ExtensionStorage) extensionSearch(name string, tag string, org string)
 
 // GenerateExtension generates the extension files and writes them to
 // the given path.
-func GenerateExtension(sig *extension.Schema, name string, tag string, org string, directory string) error {
-	encoded, err := sig.Encode()
+func GenerateExtension(ext *extension.Schema, name string, tag string, org string, directory string) error {
+	encoded, err := ext.Encode()
 	if err != nil {
 		return err
 	}
@@ -303,9 +303,9 @@ func GenerateExtension(sig *extension.Schema, name string, tag string, org strin
 	}
 
 	guestPackage, err := generator.GenerateGuestLocal(&generator.Options{
-		Extension:               sig,
+		Extension:               ext,
 		GolangPackageImportPath: "extension",
-		GolangPackageName:       "extension",
+		GolangPackageName:       ext.Name,
 		GolangPackageVersion:    "v0.1.0",
 	})
 	if err != nil {
@@ -320,7 +320,7 @@ func GenerateExtension(sig *extension.Schema, name string, tag string, org strin
 	}
 
 	hostPackage, err := generator.GenerateHostLocal(&generator.Options{
-		Extension: sig,
+		Extension: ext,
 	})
 	if err != nil {
 		return err