@@ -119,10 +119,6 @@ impl Display for UnifiedKeyError {
119
119
UnifiedKeyError :: Transparent ( e) => {
120
120
write ! ( _f, "Transparent key derivation error: {}" , e)
121
121
}
122
- #[ cfg( not( any( feature = "orchard" , feature = "transparent-inputs" ) ) ) ]
123
- other => {
124
- unreachable ! ( "Unhandled UnifiedKeyError variant {:?}" , other)
125
- }
126
122
}
127
123
}
128
124
}
@@ -608,26 +604,26 @@ impl UnifiedAddressRequest {
608
604
/// Returns `None` if the request would result in the generation of an address without any
609
605
/// receivers.
610
606
pub fn new (
611
- has_orchard : bool ,
612
- has_sapling : bool ,
613
- has_p2pkh : bool ,
607
+ _has_orchard : bool ,
608
+ _has_sapling : bool ,
609
+ _has_p2pkh : bool ,
614
610
expiry_height : Option < BlockHeight > ,
615
611
expiry_time : Option < u64 > ,
616
612
) -> Option < Self > {
617
613
#[ cfg( not( feature = "orchard" ) ) ]
618
- let has_orchard = false ;
614
+ let _has_orchard = false ;
619
615
#[ cfg( not( feature = "sapling" ) ) ]
620
- let has_sapling = false ;
616
+ let _has_sapling = false ;
621
617
#[ cfg( not( feature = "transparent-inputs" ) ) ]
622
- let has_p2pkh = false ;
618
+ let _has_p2pkh = false ;
623
619
624
- if !( has_sapling || has_orchard || has_p2pkh ) {
620
+ if !( _has_sapling || _has_orchard || _has_p2pkh ) {
625
621
None
626
622
} else {
627
623
Some ( Self {
628
- has_orchard,
629
- has_sapling,
630
- has_p2pkh,
624
+ has_orchard : _has_orchard ,
625
+ has_sapling : _has_sapling ,
626
+ has_p2pkh : _has_p2pkh ,
631
627
expiry_height,
632
628
expiry_time,
633
629
} )
0 commit comments