Remove go-plugin dependency (ava-labs#2563)

Co-authored-by: Stephen <[email protected]>

api/keystore/gkeystore/keystore_server.go

@@ -6,8 +6,6 @@ package gkeystore
 import (
 	"context"
 
-	"google.golang.org/grpc"
-
 	"github.com/ava-labs/avalanchego/api/keystore"
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/rpcdb"
@@ -43,21 +41,19 @@ func (s *Server) GetDatabase(
 
 	closer := dbCloser{Database: db}
 
-	// start the db server
 	serverListener, err := grpcutils.NewListener()
 	if err != nil {
 		return nil, err
 	}
-	serverAddr := serverListener.Addr().String()
 
-	go grpcutils.Serve(serverListener, func(opts []grpc.ServerOption) *grpc.Server {
-		server := grpcutils.NewDefaultServer(opts)
-		closer.closer.Add(server)
-		db := rpcdb.NewServer(&closer)
-		rpcdbpb.RegisterDatabaseServer(server, db)
-		return server
-	})
-	return &keystorepb.GetDatabaseResponse{ServerAddr: serverAddr}, nil
+	server := grpcutils.NewServer()
+	closer.closer.Add(server)
+	rpcdbpb.RegisterDatabaseServer(server, rpcdb.NewServer(&closer))
+
+	// start the db server
+	go grpcutils.Serve(serverListener, server)
+
+	return &keystorepb.GetDatabaseResponse{ServerAddr: serverListener.Addr().String()}, nil
 }
 
 type dbCloser struct {

app/runner/config.go

@@ -6,7 +6,4 @@ package runner
 type Config struct {
 	// If true, displays version and exits during startup
 	DisplayVersionAndExit bool
-
-	// If true, run AvalancheGo as a plugin
-	PluginMode bool
 }

app/runner/runner.go

@@ -7,38 +7,16 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/go-hclog"
-	"github.com/hashicorp/go-plugin"
-
 	"golang.org/x/term"
 
 	"github.com/ava-labs/avalanchego/app"
 	"github.com/ava-labs/avalanchego/app/process"
 	"github.com/ava-labs/avalanchego/node"
-	"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
-
-	appplugin "github.com/ava-labs/avalanchego/app/plugin"
 )
 
 // Run an AvalancheGo node.
-// If specified in the config, serves a hashicorp plugin that can be consumed by
-// the daemon (see avalanchego/main).
-func Run(config Config, nodeConfig node.Config) {
+func Run(nodeConfig node.Config) {
 	nodeApp := process.NewApp(nodeConfig) // Create node wrapper
-	if config.PluginMode {                // Serve as a plugin
-		plugin.Serve(&plugin.ServeConfig{
-			HandshakeConfig: appplugin.Handshake,
-			Plugins: map[string]plugin.Plugin{
-				appplugin.Name: appplugin.New(nodeApp),
-			},
-			GRPCServer: grpcutils.NewDefaultServer, // A non-nil value here enables gRPC serving for this plugin
-			Logger: hclog.New(&hclog.LoggerOptions{
-				Level: hclog.Error,
-			}),
-		})
-		return
-	}
-
 	if term.IsTerminal(int(os.Stdout.Fd())) {
 		fmt.Println(process.Header)
 	}

chains/atomic/gsharedmemory/shared_memory_test.go

@@ -4,31 +4,21 @@
 package gsharedmemory
 
 import (
-	"context"
 	"io"
-	"net"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/test/bufconn"
-
 	"github.com/ava-labs/avalanchego/chains/atomic"
 	"github.com/ava-labs/avalanchego/database"
 	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/database/prefixdb"
 	"github.com/ava-labs/avalanchego/ids"
-	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
 
 	sharedmemorypb "github.com/ava-labs/avalanchego/proto/pb/sharedmemory"
 )
 
-const (
-	bufSize = units.MiB
-)
-
 func TestInterface(t *testing.T) {
 	require := require.New(t)
 
@@ -56,27 +46,19 @@ func TestInterface(t *testing.T) {
 }
 
 func wrapSharedMemory(t *testing.T, sm atomic.SharedMemory, db database.Database) (atomic.SharedMemory, io.Closer) {
-	listener := bufconn.Listen(bufSize)
-	serverCloser := grpcutils.ServerCloser{}
-
-	serverFunc := func(opts []grpc.ServerOption) *grpc.Server {
-		server := grpcutils.NewDefaultServer(opts)
-		sharedmemorypb.RegisterSharedMemoryServer(server, NewServer(sm, db))
-		serverCloser.Add(server)
-		return server
+	listener, err := grpcutils.NewListener()
+	if err != nil {
+		t.Fatalf("Failed to create listener: %s", err)
 	}
+	serverCloser := grpcutils.ServerCloser{}
 
-	go grpcutils.Serve(listener, serverFunc)
+	server := grpcutils.NewServer()
+	sharedmemorypb.RegisterSharedMemoryServer(server, NewServer(sm, db))
+	serverCloser.Add(server)
 
-	dialer := grpc.WithContextDialer(
-		func(context.Context, string) (net.Conn, error) {
-			return listener.Dial()
-		},
-	)
+	go grpcutils.Serve(listener, server)
 
-	dopts := grpcutils.DefaultDialOptions
-	dopts = append(dopts, dialer)
-	conn, err := grpcutils.Dial("", dopts...)
+	conn, err := grpcutils.Dial(listener.Addr().String())
 	if err != nil {
 		t.Fatalf("Failed to dial: %s", err)
 	}

config/config.go

@@ -86,7 +86,6 @@ var (
 func GetRunnerConfig(v *viper.Viper) runner.Config {
 	return runner.Config{
 		DisplayVersionAndExit: v.GetBool(VersionKey),
-		PluginMode:            v.GetBool(PluginModeKey),
 	}
 }
 

config/flags.go

@@ -53,9 +53,6 @@ var (
 func addProcessFlags(fs *flag.FlagSet) {
 	// If true, print the version and quit.
 	fs.Bool(VersionKey, false, "If true, print version and quit")
-
-	// Plugin
-	fs.Bool(PluginModeKey, false, "Whether the app should run as a plugin")
 }
 
 func addNodeFlags(fs *flag.FlagSet) {

config/keys.go

@@ -160,7 +160,6 @@ const (
 	RetryBootstrapKey                                  = "bootstrap-retry-enabled"
 	RetryBootstrapWarnFrequencyKey                     = "bootstrap-retry-warn-frequency"
 	PluginDirKey                                       = "plugin-dir"
-	PluginModeKey                                      = "plugin-mode-enabled"
 	BootstrapBeaconConnectionTimeoutKey                = "bootstrap-beacon-connection-timeout"
 	BootstrapMaxTimeGetAncestorsKey                    = "bootstrap-max-time-get-ancestors"
 	BootstrapAncestorsMaxContainersSentKey             = "bootstrap-ancestors-max-containers-sent"