cmd/gethrpctest: ethereum/rpc-tests is deprecated

Only ethereum/rpc-tests used this command, which hasn't been maintained for over
a year now, a lot of tests failing. What's left of it was moved underneath hive,
which can run the entire test against a black-box geth without special commands.

Also a new RPC test suite is being added which is also based on black box tests,
not needing special commands any more.

1 files changed, 0 insertions, 161 deletions

diff --git a/cmd/gethrpctest/main.go b/cmd/gethrpctest/main.go
deleted file mode 100644
index 69a6074e7..000000000
--- a/cmd/gethrpctest/main.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-// gethrpctest is a command to run the external RPC tests.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"os/signal"
-
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/ethdb"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/node"
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/tests"
-	whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
-)
-
-const defaultTestKey = "b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291"
-
-var (
-	testFile = flag.String("json", "", "Path to the .json test file to load")
-	testName = flag.String("test", "", "Name of the test from the .json file to run")
-	testKey  = flag.String("key", defaultTestKey, "Private key of a test account to inject")
-)
-
-func main() {
-	flag.Parse()
-
-	// Enable logging errors, we really do want to see those
-	log.Root().SetHandler(log.LvlFilterHandler(log.LvlError, log.StreamHandler(os.Stderr, log.TerminalFormat())))
-
-	// Load the test suite to run the RPC against
-	tests, err := tests.LoadBlockTests(*testFile)
-	if err != nil {
-		log.Crit(fmt.Sprintf("Failed to load test suite: %v", err))
-	}
-	test, found := tests[*testName]
-	if !found {
-		log.Crit(fmt.Sprintf("Requested test (%s) not found within suite", *testName))
-	}
-
-	stack, err := MakeSystemNode(*testKey, test)
-	if err != nil {
-		log.Crit(fmt.Sprintf("Failed to assemble test stack: %v", err))
-	}
-	if err := stack.Start(); err != nil {
-		log.Crit(fmt.Sprintf("Failed to start test node: %v", err))
-	}
-	defer stack.Stop()
-
-	log.Info("Test node started...")
-
-	// Make sure the tests contained within the suite pass
-	if err := RunTest(stack, test); err != nil {
-		log.Crit(fmt.Sprintf("Failed to run the pre-configured test: %v", err))
-	}
-	log.Info("Initial test suite passed...")
-
-	quit := make(chan os.Signal, 1)
-	signal.Notify(quit, os.Interrupt)
-	<-quit
-}
-
-// MakeSystemNode configures a protocol stack for the RPC tests based on a given
-// keystore path and initial pre-state.
-func MakeSystemNode(privkey string, test *tests.BlockTest) (*node.Node, error) {
-	// Create a networkless protocol stack
-	stack, err := node.New(&node.Config{
-		UseLightweightKDF: true,
-		IPCPath:           node.DefaultIPCEndpoint(""),
-		HTTPHost:          node.DefaultHTTPHost,
-		HTTPPort:          node.DefaultHTTPPort,
-		HTTPModules:       []string{"admin", "db", "eth", "debug", "miner", "net", "shh", "txpool", "personal", "web3"},
-		WSHost:            node.DefaultWSHost,
-		WSPort:            node.DefaultWSPort,
-		WSModules:         []string{"admin", "db", "eth", "debug", "miner", "net", "shh", "txpool", "personal", "web3"},
-		NoDiscovery:       true,
-	})
-	if err != nil {
-		return nil, err
-	}
-	// Create the keystore and inject an unlocked account if requested
-	ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
-
-	if len(privkey) > 0 {
-		key, err := crypto.HexToECDSA(privkey)
-		if err != nil {
-			return nil, err
-		}
-		a, err := ks.ImportECDSA(key, "")
-		if err != nil {
-			return nil, err
-		}
-		if err := ks.Unlock(a, ""); err != nil {
-			return nil, err
-		}
-	}
-	// Initialize and register the Ethereum protocol
-	db, _ := ethdb.NewMemDatabase()
-	if _, err := test.InsertPreState(db); err != nil {
-		return nil, err
-	}
-	ethConf := &eth.Config{
-		TestGenesisState: db,
-		TestGenesisBlock: test.Genesis,
-		ChainConfig:      &params.ChainConfig{HomesteadBlock: params.MainNetHomesteadBlock},
-	}
-	if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { return eth.New(ctx, ethConf) }); err != nil {
-		return nil, err
-	}
-	// Initialize and register the Whisper protocol
-	if err := stack.Register(func(*node.ServiceContext) (node.Service, error) { return whisper.New(), nil }); err != nil {
-		return nil, err
-	}
-	return stack, nil
-}
-
-// RunTest executes the specified test against an already pre-configured protocol
-// stack to ensure basic checks pass before running RPC tests.
-func RunTest(stack *node.Node, test *tests.BlockTest) error {
-	var ethereum *eth.Ethereum
-	stack.Service(&ethereum)
-	blockchain := ethereum.BlockChain()
-
-	// Process the blocks and verify the imported headers
-	blocks, err := test.TryBlocksInsert(blockchain)
-	if err != nil {
-		return err
-	}
-	if err := test.ValidateImportedHeaders(blockchain, blocks); err != nil {
-		return err
-	}
-	// Retrieve the assembled state and validate it
-	stateDb, err := blockchain.State()
-	if err != nil {
-		return err
-	}
-	if err := test.ValidatePostState(stateDb); err != nil {
-		return err
-	}
-	return nil
-}