gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-17 04:48:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into eth1-deploy

Browse Source
This commit is contained in:
Paul Hauner
2019-11-27 12:48:46 +11:00
parent aad68f9e88 bf2eeae3f2
commit 280bb455d0
42 changed files with 2516 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eth2/utils/deposit_contract/src/lib.rs
View File

@@ -62,6 +62,6 @@ mod tests {
let data = eth1_tx_data(&deposit).expect("should produce tx data");
assert_eq!(data.len(), 420, "bytes should be correct length");
assert_eq!(data.len(), 388, "bytes should be correct length");
}
}

2
eth2/utils/ssz_derive/src/lib.rs
View File

@@ -231,7 +231,7 @@ pub fn ssz_decode_derive(input: TokenStream) -> TokenStream {
}
}
fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
fn from_ssz_bytes(bytes: &[u8]) -> std::result::Result<Self, ssz::DecodeError> {
let mut builder = ssz::SszDecoderBuilder::new(bytes);
#(

2
eth2/utils/tree_hash_derive/src/lib.rs
View File

@@ -246,7 +246,7 @@ pub fn cached_tree_hash_derive(input: TokenStream) -> TokenStream {
fn recalculate_tree_hash_root(
&self,
cache: &mut #cache_type)
-> Result<Hash256, cached_tree_hash::Error>
-> std::result::Result<Hash256, cached_tree_hash::Error>
{
let mut leaves = vec![];