gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 09:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Merge to Bellatrix (#5601)

Browse Source 
* Rename Merge to Bellatrix

* Remove tree-hash-cache which got readded from the rebase
This commit is contained in:
Mac L
2024-04-26 06:19:41 +10:00
committed by GitHub
parent 320345695d
commit 13f94ef0f3
104 changed files with 808 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lighthouse/environment/tests/testnet_dir/config.yaml
View File

@@ -32,7 +32,7 @@ GENESIS_DELAY: 604800
# Altair
ALTAIR_FORK_VERSION: 0x01000000
ALTAIR_FORK_EPOCH: 18446744073709551615
# Merge
# Bellatrix
BELLATRIX_FORK_VERSION: 0x02000000
BELLATRIX_FORK_EPOCH: 18446744073709551615
# Sharding

14
lighthouse/tests/beacon_node.rs
View File

@@ -416,7 +416,7 @@ fn eth1_cache_follow_distance_manual() {
}
// Tests for Bellatrix flags.
fn run_merge_execution_endpoints_flag_test(flag: &str) {
fn run_bellatrix_execution_endpoints_flag_test(flag: &str) {
use sensitive_url::SensitiveUrl;
let urls = vec!["http://sigp.io/no-way:1337", "http://infura.not_real:4242"];
// we don't support redundancy for execution-endpoints
@@ -500,15 +500,15 @@ fn execution_timeout_multiplier_flag() {
});
}
#[test]
fn merge_execution_endpoints_flag() {
run_merge_execution_endpoints_flag_test("execution-endpoints")
fn bellatrix_execution_endpoints_flag() {
run_bellatrix_execution_endpoints_flag_test("execution-endpoints")
}
#[test]
fn merge_execution_endpoint_flag() {
run_merge_execution_endpoints_flag_test("execution-endpoint")
fn bellatrix_execution_endpoint_flag() {
run_bellatrix_execution_endpoints_flag_test("execution-endpoint")
}
#[test]
fn merge_jwt_secrets_flag() {
fn bellatrix_jwt_secrets_flag() {
let dir = TempDir::new().expect("Unable to create temporary directory");
let mut file = File::create(dir.path().join("jwtsecrets")).expect("Unable to create file");
file.write_all(b"0x3cbc11b0d8fa16f3344eacfd6ff6430b9d30734450e8adcf5400f88d327dcb33")
@@ -533,7 +533,7 @@ fn merge_jwt_secrets_flag() {
});
}
#[test]
fn merge_fee_recipient_flag() {
fn bellatrix_fee_recipient_flag() {
let dir = TempDir::new().expect("Unable to create temporary directory");
CommandLineTest::new()
.flag("execution-endpoint", Some("http://meow.cats"))