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

grin output_identifier refactoring

Browse source
This commit is contained in:
antiochp 2020-09-01 14:01:20 +01:00
parent 24f35a22bb
commit 2b1ba14db5
4 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
impls/src/test_framework/mod.rs
View file

@ -40,9 +40,10 @@ fn get_output_local(chain: &chain::Chain, commit: pedersen::Commitment) -> Optio
if chain.get_unspent(commit).unwrap().is_some() { if chain.get_unspent(commit).unwrap().is_some() {
let block_height = chain.get_header_for_output(commit).unwrap().height; let block_height = chain.get_header_for_output(commit).unwrap().height;
let output_pos = chain.get_output_pos(&commit).unwrap_or(0); let output_pos = chain.get_output_pos(&commit).unwrap_or(0);
return Some(api::Output::new(&commit, block_height, output_pos)); Some(api::Output::new(&commit, block_height, output_pos))
} else {
None
} }
None
} }
/// Get a kernel from the chain locally /// Get a kernel from the chain locally

2
libwallet/src/internal/tx.rs
View file

@ -616,7 +616,7 @@ mod test {
.unwrap(); .unwrap();
let inputs: Vec<Input> = tx2.inputs().into(); let inputs: Vec<Input> = tx2.inputs().into();
assert_eq!(tx1.outputs()[0].features, inputs[0].features); assert_eq!(tx1.outputs()[0].features(), inputs[0].features);
assert_eq!(tx1.outputs()[0].commitment(), inputs[0].commitment()); assert_eq!(tx1.outputs()[0].commitment(), inputs[0].commitment());
} }

16
libwallet/src/slate.rs
View file

@ -839,8 +839,8 @@ impl From<&Slate> for Option<Vec<CommitsV4>> {
} }
for o in outs.iter() { for o in outs.iter() {
ret_vec.push(CommitsV4 { ret_vec.push(CommitsV4 {
f: o.features.into(), f: o.features().into(),
c: o.commit, c: o.commitment(),
p: Some(o.proof), p: Some(o.proof),
}); });
} }
@ -1020,14 +1020,8 @@ pub fn tx_from_slate_v4(slate: &SlateV4) -> Option<Transaction> {
let mut tx = Transaction::empty().with_kernel(kernel); let mut tx = Transaction::empty().with_kernel(kernel);
for c in coms.iter() { for c in coms.iter() {
match &c.p { match c.p {
Some(p) => { Some(p) => tx = tx.with_output(Output::new(c.f.into(), c.c, p)),
tx = tx.with_output(Output {
features: c.f.into(),
commit: c.c,
proof: p.clone(),
})
}
None => { None => {
tx = tx.with_input(Input { tx = tx.with_input(Input {
features: c.f.into(), features: c.f.into(),
@ -1036,7 +1030,7 @@ pub fn tx_from_slate_v4(slate: &SlateV4) -> Option<Transaction> {
} }
} }
} }
tx.offset = slate.off.clone(); tx = tx.with_offset(slate.off.clone());
Some(tx) Some(tx)
} }

4
libwallet/src/slate_versions/v4.rs
View file

@ -316,8 +316,8 @@ impl From<&Output> for CbOutputV4 {
fn from(output: &Output) -> CbOutputV4 { fn from(output: &Output) -> CbOutputV4 {
CbOutputV4 { CbOutputV4 {
features: CbOutputFeatures::Coinbase, features: CbOutputFeatures::Coinbase,
commit: output.commit, commit: output.commitment(),
proof: output.proof, proof: output.proof(),
} }
} }
} }