github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove validator cross client from e2e (#16025)

Browse Source
This commit is contained in:
Radosław Kapka
2025-11-17 16:02:06 +01:00
committed by GitHub
parent 4914882e97
commit 21bb6f5258
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/radek_remove-cross-validator.md Normal file
View File

@@ -0,0 +1,3 @@
### Removed
- Remove validator cross-client from end-to-end tests.

12
testing/endtoend/component_handler_test.go
View File

@@ -261,11 +261,15 @@ func (c *componentHandler) printPIDs(logger func(string, ...any)) {
msg += "This test PID: " + strconv.Itoa(os.Getpid()) + " (parent=" + strconv.Itoa(os.Getppid()) + ")\n"
// Beacon chain nodes
msg += fmt.Sprintf("Beacon chain nodes: %v\n", PIDsFromMultiComponentRunner(c.beaconNodes))
// Validator nodes
msg += fmt.Sprintf("Prysm beacon chain nodes: %v\n", PIDsFromMultiComponentRunner(c.beaconNodes))
msg += fmt.Sprintf("Prysm validators: %v\n", PIDsFromMultiComponentRunner(c.validatorNodes))
if c.lighthouseBeaconNodes != nil {
msg += fmt.Sprintf("Lighthouse beacon chain nodes: %v\n", PIDsFromMultiComponentRunner(c.lighthouseBeaconNodes))
}
if c.lighthouseValidatorNodes != nil {
msg += fmt.Sprintf("Lighthouse validators: %v\n", PIDsFromMultiComponentRunner(c.lighthouseValidatorNodes))
}
msg += fmt.Sprintf("Validators: %v\n", PIDsFromMultiComponentRunner(c.validatorNodes))
// ETH1 nodes
msg += fmt.Sprintf("ETH1 nodes: %v\n", PIDsFromMultiComponentRunner(c.eth1Nodes))
logger(msg)

4
testing/endtoend/components/lighthouse_beacon.go
View File

@@ -249,6 +249,10 @@ func (node *LighthouseBeaconNode) Stop() error {
return node.cmd.Process.Kill()
}
func (node *LighthouseBeaconNode) UnderlyingProcess() *os.Process {
return node.cmd.Process
}
func (node *LighthouseBeaconNode) createTestnetDir(ctx context.Context, index int) (string, error) {
testNetDir := e2e.TestParams.TestPath + fmt.Sprintf("/lighthouse-testnet-%d", index)
configPath := filepath.Join(testNetDir, "config.yaml")

4
testing/endtoend/components/lighthouse_validator.go
View File

@@ -240,6 +240,10 @@ func (v *LighthouseValidatorNode) Stop() error {
return v.cmd.Process.Kill()
}
func (v *LighthouseValidatorNode) UnderlyingProcess() *os.Process {
return v.cmd.Process
}
var _ types.ComponentRunner = &KeystoreGenerator{}
type KeystoreGenerator struct {

3
testing/endtoend/endtoend_setup_test.go
View File

@@ -20,7 +20,6 @@ func e2eMinimal(t *testing.T, cfg *params.BeaconChainConfig, cfgo ...types.E2ECo
require.NoError(t, params.SetActive(cfg))
require.NoError(t, e2eParams.Init(t, e2eParams.StandardBeaconCount))
// Run for 12 epochs if not in long-running to confirm long-running has no issues.
var err error
epochsToRun := 16
epochStr, longRunning := os.LookupEnv("E2E_EPOCHS")
@@ -103,7 +102,7 @@ func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool, cfg *params.Beaco
} else {
require.NoError(t, e2eParams.Init(t, e2eParams.StandardBeaconCount))
}
// Run for 10 epochs if not in long-running to confirm long-running has no issues.
var err error
epochsToRun := 16
epochStr, longRunning := os.LookupEnv("E2E_EPOCHS")

2
testing/endtoend/mainnet_e2e_test.go
View File

@@ -15,5 +15,5 @@ func TestEndToEnd_MainnetConfig_ValidatorAtCurrentRelease(t *testing.T) {
}
func TestEndToEnd_MainnetConfig_MultiClient(t *testing.T) {
e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Electra, params.E2EMainnetTestConfig()), types.WithValidatorCrossClient()).run()
e2eMainnet(t, false, true, types.InitForkCfg(version.Bellatrix, version.Electra, params.E2EMainnetTestConfig())).run()
}