Merge rust-bitcoin/rust-bitcoin#4346: chore: Fix the typos in the comments and variables
d0e1cd72fe
chore: Fix the typos in the comments and variables (dufucun)
Pull request description:
Fix the typos in the comments and variables
ACKs for top commit:
apoelstra:
ACK d0e1cd72fec87276034476f1f28c62124cf63c25; successfully ran local tests
Tree-SHA512: 267d2b6b47e5a4f9466507e9dceb62ce94c848b3edefee65b85c3ce31560d1be880ef1c03ffd7dac54198f1f470695b70e06a505f91174f2990639bc20bf86e4
This commit is contained in:
commit
9ae40372b2
|
@ -484,7 +484,7 @@ mod test {
|
|||
#[test]
|
||||
fn getblocktx_differential_encoding_de_and_serialization() {
|
||||
let testcases = vec![
|
||||
// differentially encoded VarInts, indicies
|
||||
// differentially encoded VarInts, indices
|
||||
(vec![4, 0, 5, 1, 10], vec![0, 6, 8, 19]),
|
||||
(vec![1, 0], vec![0]),
|
||||
(vec![5, 0, 0, 0, 0, 0], vec![0, 1, 2, 3, 4]),
|
||||
|
|
|
@ -556,11 +556,11 @@ fn p2sh_p2wsh_conversion() {
|
|||
// Test vectors taken from Core tests/data/script_tests.json
|
||||
// bare p2wsh
|
||||
let witness_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
|
||||
let expected_witout =
|
||||
let expected_without =
|
||||
ScriptBuf::from_hex("0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64")
|
||||
.unwrap();
|
||||
assert!(witness_script.to_p2wsh().unwrap().is_p2wsh());
|
||||
assert_eq!(witness_script.to_p2wsh().unwrap(), expected_witout);
|
||||
assert_eq!(witness_script.to_p2wsh().unwrap(), expected_without);
|
||||
|
||||
// p2sh
|
||||
let redeem_script = ScriptBuf::from_hex("0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8").unwrap();
|
||||
|
@ -571,13 +571,13 @@ fn p2sh_p2wsh_conversion() {
|
|||
|
||||
// p2sh-p2wsh
|
||||
let witness_script = ScriptBuf::from_hex("410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8ac").unwrap();
|
||||
let expected_witout =
|
||||
let expected_without =
|
||||
ScriptBuf::from_hex("0020b95237b48faaa69eb078e1170be3b5cbb3fddf16d0a991e14ad274f7b33a4f64")
|
||||
.unwrap();
|
||||
let expected_out =
|
||||
ScriptBuf::from_hex("a914f386c2ba255cc56d20cfa6ea8b062f8b5994551887").unwrap();
|
||||
assert!(witness_script.to_p2sh().unwrap().is_p2sh());
|
||||
assert_eq!(witness_script.to_p2wsh().unwrap(), expected_witout);
|
||||
assert_eq!(witness_script.to_p2wsh().unwrap(), expected_without);
|
||||
assert_eq!(witness_script.to_p2wsh().unwrap().to_p2sh().unwrap(), expected_out);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue