Fix tracer loading

plugins/interfaces/interface.go

@@ -1,4 +1,4 @@
-package plugins
+package interfaces
 
 import (
 	"context"
@@ -72,3 +72,9 @@ type Backend interface {
 	ChainConfig() *params.ChainConfig
 	Engine() consensus.Engine
 }
+
+
+type TracerResult interface {
+	vm.Tracer
+	GetResult() (interface{}, error)
+}

plugins/plugin_loader.go

@@ -3,7 +3,6 @@ package plugins
 import (
 	"plugin"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/core/vm"
 	"gopkg.in/urfave/cli.v1"
 	"flag"
 	"io/ioutil"
@@ -15,10 +14,6 @@ import (
 
 
 type Subcommand func(*cli.Context, []string) error
-type TracerResult interface {
-	vm.Tracer
-	GetResult() (interface{}, error)
-}
 
 
 type PluginLoader struct{

plugins/rpcloader/rpc_loader.go

@@ -1,47 +0,0 @@
-package rpcloader
-
-import (
-  "github.com/ethereum/go-ethereum/node"
-  "github.com/ethereum/go-ethereum/plugins"
-)
-
-type APILoader func(*node.Node, Backend) []rpc.API
-
-func GetRPCPluginsFromLoader(pl *plugins.PluginLoader) []APILoader {
-  result := []APILoader{}
-  for _, plug := range pl.Plugins {
-    fn, err := plug.Lookup("GetAPIs")
-    if err == nil {
-      apiLoader, ok := fn.(func(*node.Node, Backend) []rpc.API)
-      if !ok {
-        log.Warn("Could not cast plugin.GetAPIs to APILoader", "file", fpath)
-        } else {
-          result = append(result, APILoader(apiLoader))
-        }
-      } else { log.Debug("Error retrieving GetAPIs for plugin", "file", fpath, "error", err.Error()) }
-  }
-}
-
-func GetRPCPlugins() []APILoader {
-  if plugins.DefaultPluginLoader == nil {
-		log.Warn("Attempting GetRPCPlugins, but default PluginLoader has not been initialized")
-		return []APILoader{}
-	 }
-  return GetRPCPluginsFromLoader(plugins.DefaultPluginLoader)
-
-}
-func GetAPIsFromLoader(pl *plugins.PluginLoader, stack *node.Node, backend Backend) []rpc.API {
-	apis := []rpc.API{}
-	for _, apiLoader := range pl.RPCPlugins {
-		apis = append(apis, apiLoader(stack, backend)...)
-	}
-	return apis
-}
-
-func GetAPIs(stack *node.Node, backend Backend) []rpc.API {
-	if plugins.DefaultPluginLoader == nil {
-		log.Warn("Attempting GetAPIs, but default PluginLoader has not been initialized")
-		return []rpc.API{}
-	 }
-	return GetAPIsFromLoader(plugins.DefaultPluginLoader, stack, backend)
-}