Move Config struct and related functions to pkg

massalabs · Jul 24, 2024 · 3c2494d · 3c2494d
1 parent 05b9b8e
commit 3c2494d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/massalabs/DeWeb/int/config"
 	"github.com/massalabs/DeWeb/int/utils"
+	pkgConfig "github.com/massalabs/DeWeb/pkg/config"
 	"github.com/massalabs/DeWeb/pkg/website"
 	"github.com/massalabs/station/pkg/logger"
 )
@@ -23,7 +24,7 @@ func main() {
 		logger.Fatalf("usage: %s <website.zip>", os.Args[0])
 	}
 
-	config := config.DefaultConfig("fullpower", "https://buildnet.massa.net/api/v2")
+	config := pkgConfig.DefaultConfig("fullpower", "https://buildnet.massa.net/api/v2")
 
 	address, err := deployWebsite(config)
 	if err != nil {
@@ -33,7 +34,7 @@ func main() {
 	logger.Infof("Website uploaded successfully to address: %s", address)
 }
 
-func deployWebsite(config *config.Config) (string, error) {
+func deployWebsite(config *pkgConfig.Config) (string, error) {
 	logger.Debugf("Deploying website contract with config: %+v", config)
 
 	deploymentResult, err := website.Deploy(config)
@@ -58,7 +59,7 @@ func deployWebsite(config *config.Config) (string, error) {
 	return deploymentResult.Address, nil
 }
 
-func uploadChunks(chunks [][]byte, address string, config *config.Config) error {
+func uploadChunks(chunks [][]byte, address string, config *pkgConfig.Config) error {
 	for i, chunk := range chunks {
 		logger.Debugf("Uploading chunk %d with size: %d", i, len(chunk))
 

diff --git a/int/config/config.go → pkg/config/config.go b/int/config/config.go → pkg/config/config.go
diff --git a/pkg/website/deploy.go b/pkg/website/deploy.go
@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"fmt"
 
-	"github.com/massalabs/DeWeb/int/config"
+	"github.com/massalabs/DeWeb/pkg/config"
 	"github.com/massalabs/station/pkg/node/sendoperation"
 	"github.com/massalabs/station/pkg/node/sendoperation/signer"
 	"github.com/massalabs/station/pkg/onchain"

diff --git a/pkg/website/upload.go b/pkg/website/upload.go
@@ -3,7 +3,7 @@ package website
 import (
 	"fmt"
 
-	"github.com/massalabs/DeWeb/int/config"
+	"github.com/massalabs/DeWeb/pkg/config"
 	mwUtils "github.com/massalabs/station-massa-wallet/pkg/utils"
 	"github.com/massalabs/station/pkg/convert"
 	"github.com/massalabs/station/pkg/logger"