gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of https://github.com/sigp/lighthouse into eip4844

Browse Source
This commit is contained in:
realbigsean
2022-11-04 13:23:55 -04:00
parent c45b809b76 8600645f65
commit 1aec17b09c
26 changed files with 37 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/execution_engine_integration/src/geth.rs
View File

@@ -13,7 +13,7 @@ const GETH_REPO_URL: &str = "https://github.com/ethereum/go-ethereum";
pub fn build_result(repo_dir: &Path) -> Output {
Command::new("make")
.arg("geth")
.current_dir(&repo_dir)
.current_dir(repo_dir)
.output()
.expect("failed to make geth")
}

4
testing/execution_engine_integration/src/test_rig.rs
View File

@@ -203,8 +203,8 @@ impl<E: GenericExecutionEngine> TestRig<E> {
.await;
// We hardcode the accounts here since some EEs start with a default unlocked account
let account1 = ethers_core::types::Address::from_slice(&hex::decode(&ACCOUNT1).unwrap());
let account2 = ethers_core::types::Address::from_slice(&hex::decode(&ACCOUNT2).unwrap());
let account1 = ethers_core::types::Address::from_slice(&hex::decode(ACCOUNT1).unwrap());
let account2 = ethers_core::types::Address::from_slice(&hex::decode(ACCOUNT2).unwrap());
/*
* Check the transition config endpoint.

2
testing/execution_engine_integration/src/transactions.rs
View File

@@ -30,7 +30,7 @@ pub fn transactions<E: EthSpec>(account1: Address, account2: Address) -> Vec<Typ
Transaction::DepositDepositContract {
sender: account1,
deposit_contract_address: ethers_core::types::Address::from_slice(
&hex::decode(&DEPOSIT_CONTRACT_ADDRESS).unwrap(),
&hex::decode(DEPOSIT_CONTRACT_ADDRESS).unwrap(),
),
}
.transaction::<E>(),