Merge pull request #322 from StephenButtolph/win-c-chain

Removed `sh` dependency in the rpcchainvm
ava-labs · Aug 24, 2020 · e00a68b · e00a68b
2 parents 053a094 + 70c4da3
commit e00a68b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/ipcs/chainipc.go b/ipcs/chainipc.go
@@ -5,7 +5,7 @@ package ipcs
 
 import (
 	"fmt"
-	"path"
+	"path/filepath"
 
 	"github.com/ava-labs/gecko/ids"
 	"github.com/ava-labs/gecko/snow/triggers"
@@ -87,5 +87,5 @@ func (cipcs *ChainIPCs) Unpublish(chainID ids.ID) (bool, error) {
 }
 
 func ipcURL(ctx context, chainID ids.ID, eventType string) string {
-	return path.Join(ctx.path, fmt.Sprintf("%d-%s-%s", ctx.networkID, chainID.String(), eventType))
+	return filepath.Join(ctx.path, fmt.Sprintf("%d-%s-%s", ctx.networkID, chainID.String(), eventType))
 }
diff --git a/main/main.go b/main/main.go
@@ -5,7 +5,7 @@ package main
 
 import (
 	"fmt"
-	"path"
+	"path/filepath"
 
 	"github.com/ava-labs/gecko/nat"
 	"github.com/ava-labs/gecko/node"
@@ -22,7 +22,7 @@ func main() {
 	}
 
 	config := Config.LoggingConfig
-	config.Directory = path.Join(config.Directory, "node")
+	config.Directory = filepath.Join(config.Directory, "node")
 	factory := logging.NewFactory(config)
 	defer factory.Close()
 

diff --git a/node/node.go b/node/node.go
@@ -12,7 +12,7 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
-	"path"
+	"path/filepath"
 	"sync"
 	"time"
 
@@ -461,7 +461,7 @@ func (n *Node) initChainManager(avaxAssetID ids.ID) error {
 			Fee: n.Config.TxFee,
 		}),
 		n.vmManager.RegisterVMFactory(genesis.EVMID, &rpcchainvm.Factory{
-			Path: path.Join(n.Config.PluginDir, "evm"),
+			Path: filepath.Join(n.Config.PluginDir, "evm"),
 		}),
 		n.vmManager.RegisterVMFactory(spdagvm.ID, &spdagvm.Factory{
 			TxFee: n.Config.TxFee,

diff --git a/utils/logging/factory.go b/utils/logging/factory.go
@@ -3,9 +3,7 @@
 
 package logging
 
-import (
-	"path"
-)
+import "path/filepath"
 
 // Factory ...
 type Factory interface {
@@ -42,7 +40,7 @@ func (f *factory) Make() (Logger, error) {
 func (f *factory) MakeChain(chainID string, subdir string) (Logger, error) {
 	config := f.config
 	config.MsgPrefix = chainID + " Chain"
-	config.Directory = path.Join(config.Directory, "chain", chainID, subdir)
+	config.Directory = filepath.Join(config.Directory, "chain", chainID, subdir)
 
 	log, err := New(config)
 	if err == nil {
@@ -54,7 +52,7 @@ func (f *factory) MakeChain(chainID string, subdir string) (Logger, error) {
 // MakeSubdir ...
 func (f *factory) MakeSubdir(subdir string) (Logger, error) {
 	config := f.config
-	config.Directory = path.Join(config.Directory, subdir)
+	config.Directory = filepath.Join(config.Directory, subdir)
 
 	log, err := New(config)
 	if err == nil {

diff --git a/utils/logging/log.go b/utils/logging/log.go
@@ -7,7 +7,7 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
@@ -351,7 +351,7 @@ func (fw *fileWriter) Rotate() error {
 }
 
 func (fw *fileWriter) create(fileIndex int) (*bufio.Writer, *os.File, error) {
-	filename := path.Join(fw.config.Directory, fmt.Sprintf("%d.log", fw.fileIndex))
+	filename := filepath.Join(fw.config.Directory, fmt.Sprintf("%d.log", fw.fileIndex))
 	file, err := os.Create(filename)
 	if err != nil {
 		return nil, nil, err

diff --git a/vms/rpcchainvm/factory.go b/vms/rpcchainvm/factory.go
@@ -29,7 +29,7 @@ func (f *Factory) New(ctx *snow.Context) (interface{}, error) {
 	config := &plugin.ClientConfig{
 		HandshakeConfig: Handshake,
 		Plugins:         PluginMap,
-		Cmd:             exec.Command("sh", "-c", f.Path),
+		Cmd:             exec.Command(f.Path),
 		AllowedProtocols: []plugin.Protocol{
 			plugin.ProtocolNetRPC,
 			plugin.ProtocolGRPC,