@@ -427,10 +427,6 @@ pub enum Error {
427
427
CmsTooManyKeys ( u32 ) ,
428
428
/// A tapscript multi_a cannot support more than Weight::MAX_BLOCK/32 keys
429
429
MultiATooManyKeys ( u64 ) ,
430
- /// Encountered unprintable character in descriptor
431
- Unprintable ( u8 ) ,
432
- /// expected character while parsing descriptor; didn't find one
433
- ExpectedChar ( char ) ,
434
430
/// While parsing backward, hit beginning of script
435
431
UnexpectedStart ,
436
432
/// Got something we were not expecting
@@ -451,8 +447,6 @@ pub enum Error {
451
447
CouldNotSatisfy ,
452
448
/// Typechecking failed
453
449
TypeCheck ( String ) ,
454
- /// General error in creating descriptor
455
- BadDescriptor ( String ) ,
456
450
/// Forward-secp related errors
457
451
Secp ( bitcoin:: secp256k1:: Error ) ,
458
452
#[ cfg( feature = "compiler" ) ]
@@ -511,8 +505,6 @@ impl fmt::Display for Error {
511
505
Error :: AddrError ( ref e) => fmt:: Display :: fmt ( e, f) ,
512
506
Error :: AddrP2shError ( ref e) => fmt:: Display :: fmt ( e, f) ,
513
507
Error :: CmsTooManyKeys ( n) => write ! ( f, "checkmultisig with {} keys" , n) ,
514
- Error :: Unprintable ( x) => write ! ( f, "unprintable character 0x{:02x}" , x) ,
515
- Error :: ExpectedChar ( c) => write ! ( f, "expected {}" , c) ,
516
508
Error :: UnexpectedStart => f. write_str ( "unexpected start of script" ) ,
517
509
Error :: Unexpected ( ref s) => write ! ( f, "unexpected «{}»" , s) ,
518
510
Error :: MultiColon ( ref s) => write ! ( f, "«{}» has multiple instances of «:»" , s) ,
@@ -523,7 +515,6 @@ impl fmt::Display for Error {
523
515
Error :: MissingSig ( ref pk) => write ! ( f, "missing signature for key {:?}" , pk) ,
524
516
Error :: CouldNotSatisfy => f. write_str ( "could not satisfy" ) ,
525
517
Error :: TypeCheck ( ref e) => write ! ( f, "typecheck: {}" , e) ,
526
- Error :: BadDescriptor ( ref e) => write ! ( f, "Invalid descriptor: {}" , e) ,
527
518
Error :: Secp ( ref e) => fmt:: Display :: fmt ( e, f) ,
528
519
Error :: ContextError ( ref e) => fmt:: Display :: fmt ( e, f) ,
529
520
#[ cfg( feature = "compiler" ) ]
@@ -571,8 +562,6 @@ impl std::error::Error for Error {
571
562
| InvalidPush ( _)
572
563
| CmsTooManyKeys ( _)
573
564
| MultiATooManyKeys ( _)
574
- | Unprintable ( _)
575
- | ExpectedChar ( _)
576
565
| UnexpectedStart
577
566
| Unexpected ( _)
578
567
| MultiColon ( _)
@@ -583,7 +572,6 @@ impl std::error::Error for Error {
583
572
| MissingSig ( _)
584
573
| CouldNotSatisfy
585
574
| TypeCheck ( _)
586
- | BadDescriptor ( _)
587
575
| MaxRecursiveDepthExceeded
588
576
| NonStandardBareScript
589
577
| ImpossibleSatisfaction
0 commit comments