@@ -35,7 +35,7 @@ fn pk_from_slice(slice: &[u8], require_compressed: bool) -> Result<bitcoin::Publ
35
35
}
36
36
}
37
37
38
- fn pk_from_stackelem (
38
+ fn pk_from_stack_elem (
39
39
elem : & stack:: Element < ' _ > ,
40
40
require_compressed : bool ,
41
41
) -> Result < bitcoin:: PublicKey , Error > {
@@ -49,7 +49,7 @@ fn pk_from_stackelem(
49
49
50
50
// Parse the script with appropriate context to check for context errors like
51
51
// correct usage of x-only keys or multi_a
52
- fn script_from_stackelem < Ctx : ScriptContext > (
52
+ fn script_from_stack_elem < Ctx : ScriptContext > (
53
53
elem : & stack:: Element < ' _ > ,
54
54
) -> Result < Miniscript < Ctx :: Key , Ctx > , Error > {
55
55
match * elem {
@@ -141,7 +141,7 @@ pub(super) fn from_txdata<'txin>(
141
141
} else {
142
142
match ssig_stack. pop ( ) {
143
143
Some ( elem) => {
144
- let pk = pk_from_stackelem ( & elem, false ) ?;
144
+ let pk = pk_from_stack_elem ( & elem, false ) ?;
145
145
if * spk == bitcoin:: Script :: new_p2pkh ( & pk. to_pubkeyhash ( ) . into ( ) ) {
146
146
Ok ( (
147
147
Inner :: PublicKey ( pk. into ( ) , PubkeyType :: Pkh ) ,
@@ -162,7 +162,7 @@ pub(super) fn from_txdata<'txin>(
162
162
} else {
163
163
match wit_stack. pop ( ) {
164
164
Some ( elem) => {
165
- let pk = pk_from_stackelem ( & elem, true ) ?;
165
+ let pk = pk_from_stack_elem ( & elem, true ) ?;
166
166
if * spk == bitcoin:: Script :: new_v0_p2wpkh ( & pk. to_pubkeyhash ( ) . into ( ) ) {
167
167
Ok ( (
168
168
Inner :: PublicKey ( pk. into ( ) , PubkeyType :: Wpkh ) ,
@@ -183,7 +183,7 @@ pub(super) fn from_txdata<'txin>(
183
183
} else {
184
184
match wit_stack. pop ( ) {
185
185
Some ( elem) => {
186
- let miniscript = script_from_stackelem :: < Segwitv0 > ( & elem) ?;
186
+ let miniscript = script_from_stack_elem :: < Segwitv0 > ( & elem) ?;
187
187
let script = miniscript. encode ( ) ;
188
188
let miniscript = miniscript. to_no_checks_ms ( ) ;
189
189
let scripthash = sha256:: Hash :: hash ( & script[ ..] ) ;
@@ -233,7 +233,7 @@ pub(super) fn from_txdata<'txin>(
233
233
let tap_script = wit_stack. pop ( ) . ok_or ( Error :: UnexpectedStackEnd ) ?;
234
234
let ctrl_blk =
235
235
ControlBlock :: from_slice ( ctrl_blk) . map_err ( Error :: ControlBlockParse ) ?;
236
- let tap_script = script_from_stackelem :: < Tap > ( & tap_script) ?;
236
+ let tap_script = script_from_stack_elem :: < Tap > ( & tap_script) ?;
237
237
let ms = tap_script. to_no_checks_ms ( ) ;
238
238
// Creating new contexts is cheap
239
239
let secp = bitcoin:: secp256k1:: Secp256k1 :: verification_only ( ) ;
@@ -274,7 +274,7 @@ pub(super) fn from_txdata<'txin>(
274
274
if !ssig_stack. is_empty ( ) {
275
275
Err ( Error :: NonEmptyScriptSig )
276
276
} else {
277
- let pk = pk_from_stackelem ( & elem, true ) ?;
277
+ let pk = pk_from_stack_elem ( & elem, true ) ?;
278
278
if slice
279
279
== & bitcoin:: Script :: new_v0_p2wpkh (
280
280
& pk. to_pubkeyhash ( ) . into ( ) ,
@@ -302,7 +302,7 @@ pub(super) fn from_txdata<'txin>(
302
302
Err ( Error :: NonEmptyScriptSig )
303
303
} else {
304
304
// parse wsh with Segwitv0 context
305
- let miniscript = script_from_stackelem :: < Segwitv0 > ( & elem) ?;
305
+ let miniscript = script_from_stack_elem :: < Segwitv0 > ( & elem) ?;
306
306
let script = miniscript. encode ( ) ;
307
307
let miniscript = miniscript. to_no_checks_ms ( ) ;
308
308
let scripthash = sha256:: Hash :: hash ( & script[ ..] ) ;
@@ -324,7 +324,7 @@ pub(super) fn from_txdata<'txin>(
324
324
}
325
325
}
326
326
// normal p2sh parsed in Legacy context
327
- let miniscript = script_from_stackelem :: < Legacy > ( & elem) ?;
327
+ let miniscript = script_from_stack_elem :: < Legacy > ( & elem) ?;
328
328
let script = miniscript. encode ( ) ;
329
329
let miniscript = miniscript. to_no_checks_ms ( ) ;
330
330
if wit_stack. is_empty ( ) {
0 commit comments