clippy: fix the semicolon_if_nothing_returned lint

apoelstra · apoelstra · commit 64d6853b011f · 2025-06-26T02:24:53.000Z
Just style.
diff --git a/src/blind.rs b/src/blind.rs
@@ -1009,12 +1009,12 @@ impl Transaction {
                             let gen = Generator::new_unblinded(secp, asset.into_tag());
                             domain.push(gen);
                             let comm = PedersenCommitment::new_unblinded(secp, *v, gen);
-                            in_commits.push(comm)
+                            in_commits.push(comm);
                         }
                         Value::Confidential(comm) => {
                             let gen = Generator::new_unblinded(secp, asset.into_tag());
                             domain.push(gen);
-                            in_commits.push(*comm)
+                            in_commits.push(*comm);
                         }
                     }
                 }
diff --git a/src/pset/map/global.rs b/src/pset/map/global.rs
@@ -268,7 +268,7 @@ impl Map for Global {
             rv.push(raw::Pair {
                 key: key.to_key(),
                 value: vec![], // This is a bug in elements core c++, parses this value as vec![0]
-            })
+            });
         }
 
         impl_pset_get_pair! {
@@ -437,7 +437,7 @@ impl Decodable for Global {
                             decoder.read_exact(&mut fingerprint[..])?;
                             let mut path = Vec::<ChildNumber>::with_capacity(child_count);
                             while let Ok(index) = u32::consensus_decode(&mut decoder) {
-                                path.push(ChildNumber::from(index))
+                                path.push(ChildNumber::from(index));
                             }
                             let derivation = DerivationPath::from(path);
                             // Keys, according to BIP-174, must be unique
diff --git a/src/pset/map/input.rs b/src/pset/map/input.rs
@@ -534,7 +534,7 @@ impl Input {
                 confidential::Value::Null => {}
                 confidential::Value::Explicit(x) => ret.issuance_inflation_keys = Some(x),
                 confidential::Value::Confidential(comm) => {
-                    ret.issuance_inflation_keys_comm = Some(comm)
+                    ret.issuance_inflation_keys_comm = Some(comm);
                 }
             }
 
@@ -739,71 +739,71 @@ impl Map for Input {
                 if prop_key.is_pset_key() {
                     match prop_key.subtype {
                         PSBT_ELEMENTS_IN_ISSUANCE_VALUE => {
-                            impl_pset_prop_insert_pair!(self.issuance_value_amount <= <raw_key: _> | <raw_value : u64>)
+                            impl_pset_prop_insert_pair!(self.issuance_value_amount <= <raw_key: _> | <raw_value : u64>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_VALUE_COMMITMENT => {
-                            impl_pset_prop_insert_pair!(self.issuance_value_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>)
+                            impl_pset_prop_insert_pair!(self.issuance_value_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_VALUE_RANGEPROOF => {
-                            impl_pset_prop_insert_pair!(self.issuance_value_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.issuance_value_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_KEYS_RANGEPROOF => {
-                            impl_pset_prop_insert_pair!(self.issuance_keys_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.issuance_keys_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_PEG_IN_TX => {
-                            impl_pset_prop_insert_pair!(self.pegin_tx <= <raw_key: _> | <raw_value : bitcoin::Transaction>)
+                            impl_pset_prop_insert_pair!(self.pegin_tx <= <raw_key: _> | <raw_value : bitcoin::Transaction>);
                         }
                         // No support for TxOutProof struct yet
                         PSBT_ELEMENTS_IN_PEG_IN_TXOUT_PROOF => {
-                            impl_pset_prop_insert_pair!(self.pegin_txout_proof <= <raw_key: _> | <raw_value : Vec<u8>>)
+                            impl_pset_prop_insert_pair!(self.pegin_txout_proof <= <raw_key: _> | <raw_value : Vec<u8>>);
                         }
                         PSBT_ELEMENTS_IN_PEG_IN_GENESIS => {
-                            impl_pset_prop_insert_pair!(self.pegin_genesis_hash <= <raw_key: _> | <raw_value : BlockHash>)
+                            impl_pset_prop_insert_pair!(self.pegin_genesis_hash <= <raw_key: _> | <raw_value : BlockHash>);
                         }
                         PSBT_ELEMENTS_IN_PEG_IN_CLAIM_SCRIPT => {
-                            impl_pset_prop_insert_pair!(self.pegin_claim_script <= <raw_key: _> | <raw_value : Script>)
+                            impl_pset_prop_insert_pair!(self.pegin_claim_script <= <raw_key: _> | <raw_value : Script>);
                         }
                         PSBT_ELEMENTS_IN_PEG_IN_VALUE => {
-                            impl_pset_prop_insert_pair!(self.pegin_value <= <raw_key: _> | <raw_value : u64>)
+                            impl_pset_prop_insert_pair!(self.pegin_value <= <raw_key: _> | <raw_value : u64>);
                         }
                         PSBT_ELEMENTS_IN_PEG_IN_WITNESS => {
-                            impl_pset_prop_insert_pair!(self.pegin_witness <= <raw_key: _> | <raw_value : Vec<Vec<u8>>>)
+                            impl_pset_prop_insert_pair!(self.pegin_witness <= <raw_key: _> | <raw_value : Vec<Vec<u8>>>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_INFLATION_KEYS => {
-                            impl_pset_prop_insert_pair!(self.issuance_inflation_keys <= <raw_key: _> | <raw_value : u64>)
+                            impl_pset_prop_insert_pair!(self.issuance_inflation_keys <= <raw_key: _> | <raw_value : u64>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_INFLATION_KEYS_COMMITMENT => {
-                            impl_pset_prop_insert_pair!(self.issuance_inflation_keys_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>)
+                            impl_pset_prop_insert_pair!(self.issuance_inflation_keys_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_BLINDING_NONCE => {
-                            impl_pset_prop_insert_pair!(self.issuance_blinding_nonce <= <raw_key: _> | <raw_value : Tweak>)
+                            impl_pset_prop_insert_pair!(self.issuance_blinding_nonce <= <raw_key: _> | <raw_value : Tweak>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_ASSET_ENTROPY => {
-                            impl_pset_prop_insert_pair!(self.issuance_asset_entropy <= <raw_key: _> | <raw_value : [u8;32]>)
+                            impl_pset_prop_insert_pair!(self.issuance_asset_entropy <= <raw_key: _> | <raw_value : [u8;32]>);
                         }
                         PSBT_ELEMENTS_IN_UTXO_RANGEPROOF => {
-                            impl_pset_prop_insert_pair!(self.in_utxo_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.in_utxo_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_BLIND_VALUE_PROOF => {
-                            impl_pset_prop_insert_pair!(self.in_issuance_blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.in_issuance_blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_ISSUANCE_BLIND_INFLATION_KEYS_PROOF => {
-                            impl_pset_prop_insert_pair!(self.in_issuance_blind_inflation_keys_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.in_issuance_blind_inflation_keys_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_EXPLICIT_VALUE => {
-                            impl_pset_prop_insert_pair!(self.amount <= <raw_key: _> | <raw_value : u64>)
+                            impl_pset_prop_insert_pair!(self.amount <= <raw_key: _> | <raw_value : u64>);
                         }
                         PSBT_ELEMENTS_IN_VALUE_PROOF => {
-                            impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_IN_EXPLICIT_ASSET => {
-                            impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> | <raw_value : AssetId>)
+                            impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> | <raw_value : AssetId>);
                         }
                         PSBT_ELEMENTS_IN_ASSET_PROOF => {
-                            impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>)
+                            impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>);
                         }
                         PSBT_ELEMENTS_IN_BLINDED_ISSUANCE => {
-                            impl_pset_prop_insert_pair!(self.blinded_issuance <= <raw_key: _> | <raw_value : u8>)
+                            impl_pset_prop_insert_pair!(self.blinded_issuance <= <raw_key: _> | <raw_value : u8>);
                         }
                         _ => match self.proprietary.entry(prop_key) {
                             Entry::Vacant(empty_key) => {
diff --git a/src/pset/map/output.rs b/src/pset/map/output.rs
@@ -345,34 +345,34 @@ impl Map for Output {
                 if prop_key.is_pset_key() {
                     match prop_key.subtype {
                         PSBT_ELEMENTS_OUT_VALUE_COMMITMENT => {
-                            impl_pset_prop_insert_pair!(self.amount_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>)
+                            impl_pset_prop_insert_pair!(self.amount_comm <= <raw_key: _> | <raw_value : secp256k1_zkp::PedersenCommitment>);
                         }
                         PSBT_ELEMENTS_OUT_ASSET => {
-                            impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> | <raw_value : AssetId>)
+                            impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> | <raw_value : AssetId>);
                         }
                         PSBT_ELEMENTS_OUT_ASSET_COMMITMENT => {
-                            impl_pset_prop_insert_pair!(self.asset_comm <= <raw_key: _> | <raw_value : Generator>)
+                            impl_pset_prop_insert_pair!(self.asset_comm <= <raw_key: _> | <raw_value : Generator>);
                         }
                         PSBT_ELEMENTS_OUT_VALUE_RANGEPROOF => {
-                            impl_pset_prop_insert_pair!(self.value_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.value_rangeproof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_OUT_ASSET_SURJECTION_PROOF => {
-                            impl_pset_prop_insert_pair!(self.asset_surjection_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>)
+                            impl_pset_prop_insert_pair!(self.asset_surjection_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>);
                         }
                         PSBT_ELEMENTS_OUT_BLINDING_PUBKEY => {
-                            impl_pset_prop_insert_pair!(self.blinding_key <= <raw_key: _> | <raw_value : PublicKey>)
+                            impl_pset_prop_insert_pair!(self.blinding_key <= <raw_key: _> | <raw_value : PublicKey>);
                         }
                         PSBT_ELEMENTS_OUT_ECDH_PUBKEY => {
-                            impl_pset_prop_insert_pair!(self.ecdh_pubkey <= <raw_key: _> | <raw_value : PublicKey>)
+                            impl_pset_prop_insert_pair!(self.ecdh_pubkey <= <raw_key: _> | <raw_value : PublicKey>);
                         }
                         PSBT_ELEMENTS_OUT_BLINDER_INDEX => {
-                            impl_pset_prop_insert_pair!(self.blinder_index <= <raw_key: _> | <raw_value : u32>)
+                            impl_pset_prop_insert_pair!(self.blinder_index <= <raw_key: _> | <raw_value : u32>);
                         }
                         PSBT_ELEMENTS_OUT_BLIND_VALUE_PROOF => {
-                            impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>)
+                            impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> | <raw_value : Box<RangeProof>>);
                         }
                         PSBT_ELEMENTS_OUT_BLIND_ASSET_PROOF => {
-                            impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>)
+                            impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> | <raw_value : Box<SurjectionProof>>);
                         }
                         _ => match self.proprietary.entry(prop_key) {
                             Entry::Vacant(empty_key) => {
diff --git a/src/pset/mod.rs b/src/pset/mod.rs
@@ -441,7 +441,7 @@ impl PartiallySignedTransaction {
                         value: 0, // This value really does not matter in surjection proofs
                         value_bf: ValueBlindingFactor::zero(),
                     };
-                    ret.push(SurjectionInput::from_txout_secrets(secrets))
+                    ret.push(SurjectionInput::from_txout_secrets(secrets));
                 }
                 if inp.issuance_inflation_keys.is_some()
                     || inp.issuance_inflation_keys_comm.is_some()
@@ -452,7 +452,7 @@ impl PartiallySignedTransaction {
                         value: 0, // This value really does not matter in surjection proofs
                         value_bf: ValueBlindingFactor::zero(),
                     };
-                    ret.push(SurjectionInput::from_txout_secrets(secrets))
+                    ret.push(SurjectionInput::from_txout_secrets(secrets));
                 }
             }
         }
@@ -688,7 +688,7 @@ impl PartiallySignedTransaction {
                     .map_err(|e| PsetBlindError::BlindingProofsCreationError(last_out_index, e))?,
             ));
 
-            self.global.scalars.clear()
+            self.global.scalars.clear();
         }
         Ok(())
     }
diff --git a/src/pset/raw.rs b/src/pset/raw.rs
@@ -152,7 +152,7 @@ impl Encodable for Key {
         len += self.type_value.consensus_encode(&mut s)?;
 
         for key in &self.key {
-            len += key.consensus_encode(&mut s)?
+            len += key.consensus_encode(&mut s)?;
         }
 
         Ok(len)
diff --git a/src/pset/serialize.rs b/src/pset/serialize.rs
@@ -167,7 +167,7 @@ impl Serialize for KeySource {
         rv.append(&mut self.0.to_bytes().to_vec());
 
         for cnum in &self.1 {
-            rv.append(&mut serialize(&u32::from(*cnum)))
+            rv.append(&mut serialize(&u32::from(*cnum)));
         }
 
         rv
diff --git a/src/taproot.rs b/src/taproot.rs
@@ -932,7 +932,7 @@ mod tests{
         for (_weights, script) in script_weights {
             let ver_script = (script, LeafVersion::default());
             let ctrl_block = tree_info.control_block(&ver_script).unwrap();
-            assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))
+            assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0));
         }
     }
 
@@ -971,7 +971,7 @@ mod tests{
         for script in scripts {
             let ver_script = (script, LeafVersion::default());
             let ctrl_block = tree_info.control_block(&ver_script).unwrap();
-            assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))
+            assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1009,12 +1009,12 @@ impl Transaction {`
`1009`	`1009`	`let gen = Generator::new_unblinded(secp, asset.into_tag());`
`1010`	`1010`	`domain.push(gen);`
`1011`	`1011`	`let comm = PedersenCommitment::new_unblinded(secp, *v, gen);`
`1012`		`- in_commits.push(comm)`
	`1012`	`+ in_commits.push(comm);`
`1013`	`1013`	`}`
`1014`	`1014`	`Value::Confidential(comm) => {`
`1015`	`1015`	`let gen = Generator::new_unblinded(secp, asset.into_tag());`
`1016`	`1016`	`domain.push(gen);`
`1017`		`- in_commits.push(*comm)`
	`1017`	`+ in_commits.push(*comm);`
`1018`	`1018`	`}`
`1019`	`1019`	`}`
`1020`	`1020`	`}`
Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ impl Input {`
`534`	`534`	`confidential::Value::Null => {}`
`535`	`535`	`confidential::Value::Explicit(x) => ret.issuance_inflation_keys = Some(x),`
`536`	`536`	`confidential::Value::Confidential(comm) => {`
`537`		`- ret.issuance_inflation_keys_comm = Some(comm)`
	`537`	`+ ret.issuance_inflation_keys_comm = Some(comm);`
`538`	`538`	`}`
`539`	`539`	`}`
`540`	`540`
`@@ -739,71 +739,71 @@ impl Map for Input {`
`739`	`739`	`if prop_key.is_pset_key() {`
`740`	`740`	`match prop_key.subtype {`
`741`	`741`	`PSBT_ELEMENTS_IN_ISSUANCE_VALUE => {`
`742`		`- impl_pset_prop_insert_pair!(self.issuance_value_amount <= <raw_key: _> \| <raw_value : u64>)`
	`742`	`+ impl_pset_prop_insert_pair!(self.issuance_value_amount <= <raw_key: _> \| <raw_value : u64>);`
`743`	`743`	`}`
`744`	`744`	`PSBT_ELEMENTS_IN_ISSUANCE_VALUE_COMMITMENT => {`
`745`		`- impl_pset_prop_insert_pair!(self.issuance_value_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>)`
	`745`	`+ impl_pset_prop_insert_pair!(self.issuance_value_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>);`
`746`	`746`	`}`
`747`	`747`	`PSBT_ELEMENTS_IN_ISSUANCE_VALUE_RANGEPROOF => {`
`748`		`- impl_pset_prop_insert_pair!(self.issuance_value_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`748`	`+ impl_pset_prop_insert_pair!(self.issuance_value_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`749`	`749`	`}`
`750`	`750`	`PSBT_ELEMENTS_IN_ISSUANCE_KEYS_RANGEPROOF => {`
`751`		`- impl_pset_prop_insert_pair!(self.issuance_keys_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`751`	`+ impl_pset_prop_insert_pair!(self.issuance_keys_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`752`	`752`	`}`
`753`	`753`	`PSBT_ELEMENTS_IN_PEG_IN_TX => {`
`754`		`- impl_pset_prop_insert_pair!(self.pegin_tx <= <raw_key: _> \| <raw_value : bitcoin::Transaction>)`
	`754`	`+ impl_pset_prop_insert_pair!(self.pegin_tx <= <raw_key: _> \| <raw_value : bitcoin::Transaction>);`
`755`	`755`	`}`
`756`	`756`	`// No support for TxOutProof struct yet`
`757`	`757`	`PSBT_ELEMENTS_IN_PEG_IN_TXOUT_PROOF => {`
`758`		`- impl_pset_prop_insert_pair!(self.pegin_txout_proof <= <raw_key: _> \| <raw_value : Vec<u8>>)`
	`758`	`+ impl_pset_prop_insert_pair!(self.pegin_txout_proof <= <raw_key: _> \| <raw_value : Vec<u8>>);`
`759`	`759`	`}`
`760`	`760`	`PSBT_ELEMENTS_IN_PEG_IN_GENESIS => {`
`761`		`- impl_pset_prop_insert_pair!(self.pegin_genesis_hash <= <raw_key: _> \| <raw_value : BlockHash>)`
	`761`	`+ impl_pset_prop_insert_pair!(self.pegin_genesis_hash <= <raw_key: _> \| <raw_value : BlockHash>);`
`762`	`762`	`}`
`763`	`763`	`PSBT_ELEMENTS_IN_PEG_IN_CLAIM_SCRIPT => {`
`764`		`- impl_pset_prop_insert_pair!(self.pegin_claim_script <= <raw_key: _> \| <raw_value : Script>)`
	`764`	`+ impl_pset_prop_insert_pair!(self.pegin_claim_script <= <raw_key: _> \| <raw_value : Script>);`
`765`	`765`	`}`
`766`	`766`	`PSBT_ELEMENTS_IN_PEG_IN_VALUE => {`
`767`		`- impl_pset_prop_insert_pair!(self.pegin_value <= <raw_key: _> \| <raw_value : u64>)`
	`767`	`+ impl_pset_prop_insert_pair!(self.pegin_value <= <raw_key: _> \| <raw_value : u64>);`
`768`	`768`	`}`
`769`	`769`	`PSBT_ELEMENTS_IN_PEG_IN_WITNESS => {`
`770`		`- impl_pset_prop_insert_pair!(self.pegin_witness <= <raw_key: _> \| <raw_value : Vec<Vec<u8>>>)`
	`770`	`+ impl_pset_prop_insert_pair!(self.pegin_witness <= <raw_key: _> \| <raw_value : Vec<Vec<u8>>>);`
`771`	`771`	`}`
`772`	`772`	`PSBT_ELEMENTS_IN_ISSUANCE_INFLATION_KEYS => {`
`773`		`- impl_pset_prop_insert_pair!(self.issuance_inflation_keys <= <raw_key: _> \| <raw_value : u64>)`
	`773`	`+ impl_pset_prop_insert_pair!(self.issuance_inflation_keys <= <raw_key: _> \| <raw_value : u64>);`
`774`	`774`	`}`
`775`	`775`	`PSBT_ELEMENTS_IN_ISSUANCE_INFLATION_KEYS_COMMITMENT => {`
`776`		`- impl_pset_prop_insert_pair!(self.issuance_inflation_keys_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>)`
	`776`	`+ impl_pset_prop_insert_pair!(self.issuance_inflation_keys_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>);`
`777`	`777`	`}`
`778`	`778`	`PSBT_ELEMENTS_IN_ISSUANCE_BLINDING_NONCE => {`
`779`		`- impl_pset_prop_insert_pair!(self.issuance_blinding_nonce <= <raw_key: _> \| <raw_value : Tweak>)`
	`779`	`+ impl_pset_prop_insert_pair!(self.issuance_blinding_nonce <= <raw_key: _> \| <raw_value : Tweak>);`
`780`	`780`	`}`
`781`	`781`	`PSBT_ELEMENTS_IN_ISSUANCE_ASSET_ENTROPY => {`
`782`		`- impl_pset_prop_insert_pair!(self.issuance_asset_entropy <= <raw_key: _> \| <raw_value : [u8;32]>)`
	`782`	`+ impl_pset_prop_insert_pair!(self.issuance_asset_entropy <= <raw_key: _> \| <raw_value : [u8;32]>);`
`783`	`783`	`}`
`784`	`784`	`PSBT_ELEMENTS_IN_UTXO_RANGEPROOF => {`
`785`		`- impl_pset_prop_insert_pair!(self.in_utxo_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`785`	`+ impl_pset_prop_insert_pair!(self.in_utxo_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`786`	`786`	`}`
`787`	`787`	`PSBT_ELEMENTS_IN_ISSUANCE_BLIND_VALUE_PROOF => {`
`788`		`- impl_pset_prop_insert_pair!(self.in_issuance_blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`788`	`+ impl_pset_prop_insert_pair!(self.in_issuance_blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`789`	`789`	`}`
`790`	`790`	`PSBT_ELEMENTS_IN_ISSUANCE_BLIND_INFLATION_KEYS_PROOF => {`
`791`		`- impl_pset_prop_insert_pair!(self.in_issuance_blind_inflation_keys_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`791`	`+ impl_pset_prop_insert_pair!(self.in_issuance_blind_inflation_keys_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`792`	`792`	`}`
`793`	`793`	`PSBT_ELEMENTS_IN_EXPLICIT_VALUE => {`
`794`		`- impl_pset_prop_insert_pair!(self.amount <= <raw_key: _> \| <raw_value : u64>)`
	`794`	`+ impl_pset_prop_insert_pair!(self.amount <= <raw_key: _> \| <raw_value : u64>);`
`795`	`795`	`}`
`796`	`796`	`PSBT_ELEMENTS_IN_VALUE_PROOF => {`
`797`		`- impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`797`	`+ impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`798`	`798`	`}`
`799`	`799`	`PSBT_ELEMENTS_IN_EXPLICIT_ASSET => {`
`800`		`- impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> \| <raw_value : AssetId>)`
	`800`	`+ impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> \| <raw_value : AssetId>);`
`801`	`801`	`}`
`802`	`802`	`PSBT_ELEMENTS_IN_ASSET_PROOF => {`
`803`		`- impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>)`
	`803`	`+ impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>);`
`804`	`804`	`}`
`805`	`805`	`PSBT_ELEMENTS_IN_BLINDED_ISSUANCE => {`
`806`		`- impl_pset_prop_insert_pair!(self.blinded_issuance <= <raw_key: _> \| <raw_value : u8>)`
	`806`	`+ impl_pset_prop_insert_pair!(self.blinded_issuance <= <raw_key: _> \| <raw_value : u8>);`
`807`	`807`	`}`
`808`	`808`	`_ => match self.proprietary.entry(prop_key) {`
`809`	`809`	`Entry::Vacant(empty_key) => {`
Original file line number	Diff line number	Diff line change
`@@ -345,34 +345,34 @@ impl Map for Output {`
`345`	`345`	`if prop_key.is_pset_key() {`
`346`	`346`	`match prop_key.subtype {`
`347`	`347`	`PSBT_ELEMENTS_OUT_VALUE_COMMITMENT => {`
`348`		`- impl_pset_prop_insert_pair!(self.amount_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>)`
	`348`	`+ impl_pset_prop_insert_pair!(self.amount_comm <= <raw_key: _> \| <raw_value : secp256k1_zkp::PedersenCommitment>);`
`349`	`349`	`}`
`350`	`350`	`PSBT_ELEMENTS_OUT_ASSET => {`
`351`		`- impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> \| <raw_value : AssetId>)`
	`351`	`+ impl_pset_prop_insert_pair!(self.asset <= <raw_key: _> \| <raw_value : AssetId>);`
`352`	`352`	`}`
`353`	`353`	`PSBT_ELEMENTS_OUT_ASSET_COMMITMENT => {`
`354`		`- impl_pset_prop_insert_pair!(self.asset_comm <= <raw_key: _> \| <raw_value : Generator>)`
	`354`	`+ impl_pset_prop_insert_pair!(self.asset_comm <= <raw_key: _> \| <raw_value : Generator>);`
`355`	`355`	`}`
`356`	`356`	`PSBT_ELEMENTS_OUT_VALUE_RANGEPROOF => {`
`357`		`- impl_pset_prop_insert_pair!(self.value_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`357`	`+ impl_pset_prop_insert_pair!(self.value_rangeproof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`358`	`358`	`}`
`359`	`359`	`PSBT_ELEMENTS_OUT_ASSET_SURJECTION_PROOF => {`
`360`		`- impl_pset_prop_insert_pair!(self.asset_surjection_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>)`
	`360`	`+ impl_pset_prop_insert_pair!(self.asset_surjection_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>);`
`361`	`361`	`}`
`362`	`362`	`PSBT_ELEMENTS_OUT_BLINDING_PUBKEY => {`
`363`		`- impl_pset_prop_insert_pair!(self.blinding_key <= <raw_key: _> \| <raw_value : PublicKey>)`
	`363`	`+ impl_pset_prop_insert_pair!(self.blinding_key <= <raw_key: _> \| <raw_value : PublicKey>);`
`364`	`364`	`}`
`365`	`365`	`PSBT_ELEMENTS_OUT_ECDH_PUBKEY => {`
`366`		`- impl_pset_prop_insert_pair!(self.ecdh_pubkey <= <raw_key: _> \| <raw_value : PublicKey>)`
	`366`	`+ impl_pset_prop_insert_pair!(self.ecdh_pubkey <= <raw_key: _> \| <raw_value : PublicKey>);`
`367`	`367`	`}`
`368`	`368`	`PSBT_ELEMENTS_OUT_BLINDER_INDEX => {`
`369`		`- impl_pset_prop_insert_pair!(self.blinder_index <= <raw_key: _> \| <raw_value : u32>)`
	`369`	`+ impl_pset_prop_insert_pair!(self.blinder_index <= <raw_key: _> \| <raw_value : u32>);`
`370`	`370`	`}`
`371`	`371`	`PSBT_ELEMENTS_OUT_BLIND_VALUE_PROOF => {`
`372`		`- impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>)`
	`372`	`+ impl_pset_prop_insert_pair!(self.blind_value_proof <= <raw_key: _> \| <raw_value : Box<RangeProof>>);`
`373`	`373`	`}`
`374`	`374`	`PSBT_ELEMENTS_OUT_BLIND_ASSET_PROOF => {`
`375`		`- impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>)`
	`375`	`+ impl_pset_prop_insert_pair!(self.blind_asset_proof <= <raw_key: _> \| <raw_value : Box<SurjectionProof>>);`
`376`	`376`	`}`
`377`	`377`	`_ => match self.proprietary.entry(prop_key) {`
`378`	`378`	`Entry::Vacant(empty_key) => {`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ impl PartiallySignedTransaction {`
`441`	`441`	`value: 0, // This value really does not matter in surjection proofs`
`442`	`442`	`value_bf: ValueBlindingFactor::zero(),`
`443`	`443`	`};`
`444`		`- ret.push(SurjectionInput::from_txout_secrets(secrets))`
	`444`	`+ ret.push(SurjectionInput::from_txout_secrets(secrets));`
`445`	`445`	`}`
`446`	`446`	`if inp.issuance_inflation_keys.is_some()`
`447`	`447`	`\|\| inp.issuance_inflation_keys_comm.is_some()`
`@@ -452,7 +452,7 @@ impl PartiallySignedTransaction {`
`452`	`452`	`value: 0, // This value really does not matter in surjection proofs`
`453`	`453`	`value_bf: ValueBlindingFactor::zero(),`
`454`	`454`	`};`
`455`		`- ret.push(SurjectionInput::from_txout_secrets(secrets))`
	`455`	`+ ret.push(SurjectionInput::from_txout_secrets(secrets));`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`	`}`
`@@ -688,7 +688,7 @@ impl PartiallySignedTransaction {`
`688`	`688`	`.map_err(\|e\| PsetBlindError::BlindingProofsCreationError(last_out_index, e))?,`
`689`	`689`	`));`
`690`	`690`
`691`		`- self.global.scalars.clear()`
	`691`	`+ self.global.scalars.clear();`
`692`	`692`	`}`
`693`	`693`	`Ok(())`
`694`	`694`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ impl Encodable for Key {`
`152`	`152`	`len += self.type_value.consensus_encode(&mut s)?;`
`153`	`153`
`154`	`154`	`for key in &self.key {`
`155`		`- len += key.consensus_encode(&mut s)?`
	`155`	`+ len += key.consensus_encode(&mut s)?;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`Ok(len)`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ impl Serialize for KeySource {`
`167`	`167`	`rv.append(&mut self.0.to_bytes().to_vec());`
`168`	`168`
`169`	`169`	`for cnum in &self.1 {`
`170`		`- rv.append(&mut serialize(&u32::from(*cnum)))`
	`170`	`+ rv.append(&mut serialize(&u32::from(*cnum)));`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`rv`
Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ mod tests{`
`932`	`932`	`for (_weights, script) in script_weights {`
`933`	`933`	`let ver_script = (script, LeafVersion::default());`
`934`	`934`	`let ctrl_block = tree_info.control_block(&ver_script).unwrap();`
`935`		`- assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))`
	`935`	`+ assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0));`
`936`	`936`	`}`
`937`	`937`	`}`
`938`	`938`
`@@ -971,7 +971,7 @@ mod tests{`
`971`	`971`	`for script in scripts {`
`972`	`972`	`let ver_script = (script, LeafVersion::default());`
`973`	`973`	`let ctrl_block = tree_info.control_block(&ver_script).unwrap();`
`974`		`- assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))`
	`974`	`+ assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0));`
`975`	`975`	`}`
`976`	`976`	`}`
`977`	`977`	`}`