Cleanup part 3

prysmaticlabs · Feb 7, 2024 · 8e36291 · 8e36291
1 parent 88ee17d
commit 8e36291
Show file tree

Hide file tree

Showing 57 changed files with 870 additions and 861 deletions.
diff --git a/cmd/validator/accounts/exit_test.go b/cmd/validator/accounts/exit_test.go
@@ -99,7 +99,7 @@ func TestExitAccountsCli_OK(t *testing.T) {
 	require.NotNil(t, formattedPubKeys)
 
 	cfg := accounts.PerformExitCfg{
-		ValidatorClient:  mockValidatorClient,
+		Coordinator:      mockValidatorClient,
 		NodeClient:       mockNodeClient,
 		Keymanager:       km,
 		RawPubKeys:       rawPubKeys,
@@ -199,7 +199,7 @@ func TestExitAccountsCli_OK_AllPublicKeys(t *testing.T) {
 	require.NotNil(t, formattedPubKeys)
 
 	cfg := accounts.PerformExitCfg{
-		ValidatorClient:  mockValidatorClient,
+		Coordinator:      mockValidatorClient,
 		NodeClient:       mockNodeClient,
 		Keymanager:       km,
 		RawPubKeys:       rawPubKeys,
@@ -294,7 +294,7 @@ func TestExitAccountsCli_OK_ForceExit(t *testing.T) {
 	require.NotNil(t, formattedPubKeys)
 
 	cfg := accounts.PerformExitCfg{
-		ValidatorClient:  mockValidatorClient,
+		Coordinator:      mockValidatorClient,
 		NodeClient:       mockNodeClient,
 		Keymanager:       km,
 		RawPubKeys:       rawPubKeys,
@@ -381,7 +381,7 @@ func TestExitAccountsCli_WriteJSON_NoBroadcast(t *testing.T) {
 	out := path.Join(bazel.TestTmpDir(), "exits")
 
 	cfg := accounts.PerformExitCfg{
-		ValidatorClient:  mockValidatorClient,
+		Coordinator:      mockValidatorClient,
 		NodeClient:       mockNodeClient,
 		Keymanager:       km,
 		RawPubKeys:       rawPubKeys,

diff --git a/testing/validator-mock/BUILD.bazel b/testing/validator-mock/BUILD.bazel
@@ -5,9 +5,9 @@ package(default_testonly = True)
 go_library(
     name = "go_default_library",
     srcs = [
-        "beacon_chain_client_mock.go",
+        "chain_client_mock.go",
         "node_client_mock.go",
-        "prysm_beacon_chain_client_mock.go",
+        "prysm_chain_client_mock.go",
         "validator_client_mock.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/v4/testing/validator-mock",

diff --git a/...alidator-mock/beacon_chain_client_mock.go → testing/validator-mock/chain_client_mock.go b/...alidator-mock/beacon_chain_client_mock.go → testing/validator-mock/chain_client_mock.go
diff --git a/testing/validator-mock/prysm_beacon_chain_client_mock.go b/testing/validator-mock/prysm_beacon_chain_client_mock.go
diff --git a/testing/validator-mock/prysm_chain_client_mock.go b/testing/validator-mock/prysm_chain_client_mock.go