Makefile,tests: env vars s/PARITY/OPENETHEREUM/

'Parity' has changed management and has
been renamed to openethereum.

Signed-off-by: meows <b5c6@protonmail.com>

Makefile

@@ -42,8 +42,8 @@ test-coregeth: test-coregeth-features test-coregeth-chainspecs ## Runs all tests
 test-coregeth-features: test-coregeth-features-parity test-coregeth-features-coregeth test-coregeth-features-multigethv0 ## Runs tests specific to multi-geth using Fork/Feature configs.
 
 test-coregeth-features-parity:
-	@echo "Testing fork/feature/datatype implementation; equivalence - PARITY."
-	env COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_PARITY=on go test -count=1 ./tests
+	@echo "Testing fork/feature/datatype implementation; equivalence - OPENETHEREUM."
+	env COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_OPENETHEREUM=on go test -count=1 ./tests
 
 test-coregeth-features-coregeth:
 	@echo "Testing fork/feature/datatype implementation; equivalence - MULTIGETH."
@@ -55,19 +55,19 @@ test-coregeth-features-multigethv0:
 
 test-coregeth-chainspecs: ## Run tests specific to multi-geth using chainspec file configs.
 	@echo "Testing Parity JSON chainspec equivalence."
-	env COREGETH_TESTS_CHAINCONFIG_PARITY_SPECS=on go test -count=1 ./tests
+	env COREGETH_TESTS_CHAINCONFIG_OPENETHEREUM_SPECS=on go test -count=1 ./tests
 
 tests-generate: tests-generate-state tests-generate-difficulty ## Generate all tests.
 
 tests-generate-state: ## Generate state tests.
 	@echo "Generating state tests."
-	env COREGETH_TESTS_CHAINCONFIG_PARITY_SPECS=on \
+	env COREGETH_TESTS_CHAINCONFIG_OPENETHEREUM_SPECS=on \
 	env COREGETH_TESTS_GENERATE_STATE_TESTS=on \
 	go run build/ci.go test -v ./tests -run TestGenState
 
 tests-generate-difficulty: ## Generate difficulty tests.
 	@echo "Generating difficulty tests."
-	env COREGETH_TESTS_CHAINCONFIG_PARITY_SPECS=on \
+	env COREGETH_TESTS_CHAINCONFIG_OPENETHEREUM_SPECS=on \
 	env COREGETH_TESTS_GENERATE_DIFFICULTY_TESTS=on \
 	go run build/ci.go test -v ./tests -run TestDifficultyGen
 

tests/difficulty_mgen_test.go

@@ -42,7 +42,7 @@ func TestDifficultyGen(t *testing.T) {
 	if !generateTests {
 		t.Skip()
 	}
-	if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_PARITY_KEY) == "" {
+	if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_OPENETHEREUM_KEY) == "" {
 		t.Fatal("Must run test generation with JSON file chain configurations.")
 	}
 

tests/init_mgen.go

@@ -34,14 +34,14 @@ var (
 
 	// Feature Equivalence tests use convert.Convert to
 	// run tests using alternating ChainConfig data type implementations.
-	CG_CHAINCONFIG_FEATURE_EQ_COREGETH_KEY    = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_COREGETH"
-	CG_CHAINCONFIG_FEATURE_EQ_MULTIGETHV0_KEY = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_MULTIGETHV0"
-	CG_CHAINCONFIG_FEATURE_EQ_PARITY_KEY      = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_PARITY"
+	CG_CHAINCONFIG_FEATURE_EQ_COREGETH_KEY     = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_COREGETH"
+	CG_CHAINCONFIG_FEATURE_EQ_MULTIGETHV0_KEY  = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_MULTIGETHV0"
+	CG_CHAINCONFIG_FEATURE_EQ_OPENETHEREUM_KEY = "COREGETH_TESTS_CHAINCONFIG_FEATURE_EQUIVALENCE_OPENETHEREUM"
 
 	// Parity specs tests use Parity JSON config data (in params/parity.json.d/)
 	// when applicable as equivalent config implementations for the default Go data type
 	// configs.
-	CG_CHAINCONFIG_CHAINSPECS_PARITY_KEY = "COREGETH_TESTS_CHAINCONFIG_PARITY_SPECS"
+	CG_CHAINCONFIG_CHAINSPECS_OPENETHEREUM_KEY = "COREGETH_TESTS_CHAINCONFIG_OPENETHEREUM_SPECS"
 )
 
 type chainspecRefsT map[string]chainspecRef

tests/params.go

@@ -150,7 +150,7 @@ func init() {
 			difficultyChainConfigurations[k] = pspec
 		}
 
-	} else if os.Getenv(CG_CHAINCONFIG_FEATURE_EQ_PARITY_KEY) != "" {
+	} else if os.Getenv(CG_CHAINCONFIG_FEATURE_EQ_OPENETHEREUM_KEY) != "" {
 		log.Println("converting to Parity data type.")
 
 		for i, config := range Forks {
@@ -169,7 +169,7 @@ func init() {
 			difficultyChainConfigurations[k] = pspec
 		}
 
-	} else if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_PARITY_KEY) != "" {
+	} else if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_OPENETHEREUM_KEY) != "" {
 		log.Println("Setting chain configurations from Parity chainspecs")
 
 		for k, v := range MapForkNameChainspecFileState {

tests/state_mgen_test.go

@@ -37,7 +37,7 @@ func TestGenState(t *testing.T) {
 	if os.Getenv(CG_GENERATE_STATE_TESTS_KEY) == "" {
 		t.Skip()
 	}
-	if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_PARITY_KEY) == "" {
+	if os.Getenv(CG_CHAINCONFIG_CHAINSPECS_OPENETHEREUM_KEY) == "" {
 		t.Fatal("Must use chainspec files for fork configurations.")
 	}