Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

block.merge() is unused (and misleading) (#674)

Browse source
This commit is contained in:
Antioch Peverell 2018-01-31 16:58:41 -05:00 committed by Ignotus Peverell
parent 3f15f7f2f9
commit e86de901fb
1 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
core/src/core/block.rs
View file

@ -554,33 +554,6 @@ impl Block {
}
}
/// Merges the 2 blocks, essentially appending the inputs, outputs and
/// kernels.
/// Also performs a compaction on the result.
pub fn merge(&self, other: Block) -> Block {
let mut all_inputs = self.inputs.clone();
all_inputs.append(&mut other.inputs.clone());
let mut all_outputs = self.outputs.clone();
all_outputs.append(&mut other.outputs.clone());
let mut all_kernels = self.kernels.clone();
all_kernels.append(&mut other.kernels.clone());
Block {
// compact will fix the merkle tree
header: BlockHeader {
pow: self.header.pow.clone(),
difficulty: self.header.difficulty.clone(),
total_difficulty: self.header.total_difficulty.clone(),
..self.header
},
inputs: all_inputs,
outputs: all_outputs,
kernels: all_kernels,
}.cut_through()
}
/// Validates all the elements in a block that can be checked without
/// additional data. Includes commitment sums and kernels, Merkle
/// trees, reward, etc.
@ -914,49 +887,6 @@ mod test {
assert_eq!(b.outputs.len(), 3);
}
#[test]
// builds 2 different blocks with a tx spending another and check if merging
// occurs
fn mergeable_blocks() {
let keychain = Keychain::from_random_seed().unwrap();
let key_id1 = keychain.derive_key_id(1).unwrap();
let key_id2 = keychain.derive_key_id(2).unwrap();
let key_id3 = keychain.derive_key_id(3).unwrap();
let mut btx1 = tx2i1o();
let (mut btx2, _) = build::transaction(
vec![input(7, ZERO_HASH, key_id1), output(5, key_id2.clone()), with_fee(2)],
&keychain,
).unwrap();
// spending tx2 - reuse key_id2
let mut btx3 = txspend1i1o(5, &keychain, key_id2.clone(), key_id3);
let b1 = new_block(vec![&mut btx1, &mut btx2], &keychain);
b1.validate().unwrap();
let b2 = new_block(vec![&mut btx3], &keychain);
b2.validate().unwrap();
// block should have been automatically compacted and should still be valid
let b3 = b1.merge(b2);
assert_eq!(b3.inputs.len(), 3);
assert_eq!(b3.outputs.len(), 4);
assert_eq!(b3.kernels.len(), 5);
// The merged block will actually fail validation (>1 coinbase kernels)
// Technically we support blocks with multiple coinbase kernels but we are
// artificially limiting it to 1 for now
assert!(b3.validate().is_err());
assert_eq!(
b3.kernels
.iter()
.filter(|x| x.features.contains(COINBASE_KERNEL))
.count(),
2);
}
#[test]
fn empty_block_with_coinbase_is_valid() {
let keychain = Keychain::from_random_seed().unwrap();