Feat/gardening 20200727

Makefile

@@ -40,10 +40,10 @@ sync-parity-chainspecs:
 	./params/parity.json.d/sync-parity-remote.sh
 
 test-coregeth: \
- test-coregeth-regression-condensed \
  test-coregeth-features \
  test-coregeth-chainspecs \
- test-coregeth-consensus ## Runs all tests specific to core-geth.
+ test-coregeth-consensus \
+ test-coregeth-regression-condensed ## Runs all tests specific to core-geth.
 
 # Generate the necessary shared object for EVMC unit tests.
 evmc/bindings/go/evmc/example_vm.so:

cmd/echainspec/util.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"strings"
 
-	"github.com/ethereum/go-ethereum/params/types/coregeth"
 	"github.com/ethereum/go-ethereum/params/types/ctypes"
 	"github.com/ethereum/go-ethereum/params/types/genesisT"
-	"github.com/ethereum/go-ethereum/params/types/goethereum"
+	"github.com/ethereum/go-ethereum/params/types/parity"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -41,12 +41,17 @@ func unmarshalChainSpec(format string, data []byte) (conf ctypes.Configurator, e
 		Config ctypes.ChainConfigurator `json:"config"`
 	}
 	var d dec
-	if format == "geth" {
-		d.Config = &goethereum.ChainConfig{}
-	} else if format == "multigeth" {
-		d.Config = &coregeth.CoreGethChainConfig{}
-	} else {
-		panic("impossible")
+	configurator, ok := chainspecFormatTypes[format]
+	if !ok {
+		return nil, fmt.Errorf("unknown chainspec format type: %v", format)
+	}
+	switch t := configurator.(type) {
+	case *genesisT.Genesis:
+		d.Config = t.Config
+	case *parity.ParityChainSpec:
+		// Don't need to do anything here; the Parity type already conforms to ChainConfigurator.
+	default:
+		return nil, fmt.Errorf("unhandled chainspec type: %v %v", format, t)
 	}
 	t := chainspecFormatTypes[format].(*genesisT.Genesis)
 	err = json.Unmarshal(data, &d)

cmd/geth/consolecmd_test.go

@@ -57,6 +57,7 @@ func TestConsoleCmdNetworkIdentities(t *testing.T) {
 
 		// All other possible --<chain> values.
 		{[]string{"--testnet"}, 3, 3, params.RopstenGenesisHash.Hex()},
+		{[]string{"--ropsten"}, 3, 3, params.RopstenGenesisHash.Hex()},
 		{[]string{"--rinkeby"}, 4, 4, params.RinkebyGenesisHash.Hex()},
 		{[]string{"--goerli"}, 5, 5, params.GoerliGenesisHash.Hex()},
 		{[]string{"--kotti"}, 6, 6, params.KottiGenesisHash.Hex()},

params/confp/configurator.go

@@ -98,8 +98,8 @@ func IsEmpty(anything interface{}) bool {
 func IsValid(conf ctypes.ChainConfigurator, head *uint64) *ConfigValidError {
 
 	// head-agnostic logic
-	if conf.GetNetworkID() == nil || *conf.GetNetworkID() == 0 {
-		return NewValidErr("NetworkID cannot be empty nor zero", ">=0", conf.GetNetworkID())
+	if conf.GetNetworkID() == nil {
+		return NewValidErr("NetworkID cannot be nil", "!=nil", conf.GetNetworkID())
 	}
 	if head == nil {
 		return nil