mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-31 13:17:09 +00:00
Resolve merge conflicts
This commit is contained in:
@@ -1019,7 +1019,6 @@ fn test_tcp_columns_by_root_chunked_rpc_for_fork(fork_name: ForkName) {
|
||||
column: vec![vec![0; E::bytes_per_cell()].try_into().unwrap()]
|
||||
.try_into()
|
||||
.unwrap(),
|
||||
kzg_commitments: vec![KzgCommitment::empty_for_testing()].try_into().unwrap(),
|
||||
kzg_proofs: vec![KzgProof::empty()].try_into().unwrap(),
|
||||
}))
|
||||
} else {
|
||||
@@ -1190,7 +1189,6 @@ fn test_tcp_columns_by_range_chunked_rpc_for_fork(fork_name: ForkName) {
|
||||
column: vec![vec![0; E::bytes_per_cell()].try_into().unwrap()]
|
||||
.try_into()
|
||||
.unwrap(),
|
||||
kzg_commitments: vec![KzgCommitment::empty_for_testing()].try_into().unwrap(),
|
||||
kzg_proofs: vec![KzgProof::empty()].try_into().unwrap(),
|
||||
}))
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user