8
8
use std:: collections:: BTreeMap ;
9
9
use std:: collections:: BTreeSet ;
10
10
11
- use bitcoin:: consensus:: encode:: deserialize;
12
- use bitcoin:: consensus:: encode:: serialize;
13
11
use bitcoin:: OutPoint ;
14
12
use bitvec:: array:: BitArray ;
15
13
use clarity:: codec:: StacksMessageCodec as _;
@@ -49,8 +47,6 @@ use crate::error::Error;
49
47
use crate :: keys:: PublicKey ;
50
48
use crate :: message:: BitcoinPreSignAck ;
51
49
use crate :: message:: BitcoinPreSignRequest ;
52
- use crate :: message:: BitcoinTransactionSignAck ;
53
- use crate :: message:: BitcoinTransactionSignRequest ;
54
50
use crate :: message:: Payload ;
55
51
use crate :: message:: SignerDepositDecision ;
56
52
use crate :: message:: SignerMessage ;
@@ -613,25 +609,6 @@ impl TryFrom<proto::StacksTransactionSignRequest> for StacksTransactionSignReque
613
609
}
614
610
}
615
611
616
- impl From < BitcoinTransactionSignRequest > for proto:: BitcoinTransactionSignRequest {
617
- fn from ( value : BitcoinTransactionSignRequest ) -> Self {
618
- proto:: BitcoinTransactionSignRequest {
619
- tx : serialize ( & value. tx ) ,
620
- aggregate_key : Some ( value. aggregate_key . into ( ) ) ,
621
- }
622
- }
623
- }
624
-
625
- impl TryFrom < proto:: BitcoinTransactionSignRequest > for BitcoinTransactionSignRequest {
626
- type Error = Error ;
627
- fn try_from ( value : proto:: BitcoinTransactionSignRequest ) -> Result < Self , Self :: Error > {
628
- Ok ( BitcoinTransactionSignRequest {
629
- tx : deserialize ( & value. tx ) . map_err ( Error :: DecodeBitcoinTransaction ) ?,
630
- aggregate_key : value. aggregate_key . required ( ) ?. try_into ( ) ?,
631
- } )
632
- }
633
- }
634
-
635
612
impl From < DkgBegin > for proto:: DkgBegin {
636
613
fn from ( value : DkgBegin ) -> Self {
637
614
proto:: DkgBegin { dkg_id : value. dkg_id }
@@ -1159,23 +1136,6 @@ impl TryFrom<proto::WstsMessage> for WstsMessage {
1159
1136
}
1160
1137
}
1161
1138
1162
- impl From < BitcoinTransactionSignAck > for proto:: BitcoinTransactionSignAck {
1163
- fn from ( value : BitcoinTransactionSignAck ) -> Self {
1164
- proto:: BitcoinTransactionSignAck {
1165
- txid : Some ( BitcoinTxId :: from ( value. txid ) . into ( ) ) ,
1166
- }
1167
- }
1168
- }
1169
-
1170
- impl TryFrom < proto:: BitcoinTransactionSignAck > for BitcoinTransactionSignAck {
1171
- type Error = Error ;
1172
- fn try_from ( value : proto:: BitcoinTransactionSignAck ) -> Result < Self , Self :: Error > {
1173
- Ok ( BitcoinTransactionSignAck {
1174
- txid : BitcoinTxId :: try_from ( value. txid . required ( ) ?) ?. into ( ) ,
1175
- } )
1176
- }
1177
- }
1178
-
1179
1139
impl From < StacksTransactionSignature > for proto:: StacksTransactionSignature {
1180
1140
fn from ( value : StacksTransactionSignature ) -> Self {
1181
1141
proto:: StacksTransactionSignature {
@@ -1340,12 +1300,6 @@ impl From<Payload> for proto::Payload {
1340
1300
Payload :: StacksTransactionSignature ( inner) => {
1341
1301
proto:: signer_message:: Payload :: StacksTransactionSignature ( inner. into ( ) )
1342
1302
}
1343
- Payload :: BitcoinTransactionSignRequest ( inner) => {
1344
- proto:: signer_message:: Payload :: BitcoinTransactionSignRequest ( inner. into ( ) )
1345
- }
1346
- Payload :: BitcoinTransactionSignAck ( inner) => {
1347
- proto:: signer_message:: Payload :: BitcoinTransactionSignAck ( inner. into ( ) )
1348
- }
1349
1303
Payload :: WstsMessage ( inner) => {
1350
1304
proto:: signer_message:: Payload :: WstsMessage ( inner. into ( ) )
1351
1305
}
@@ -1375,12 +1329,6 @@ impl TryFrom<proto::Payload> for Payload {
1375
1329
proto:: signer_message:: Payload :: StacksTransactionSignature ( inner) => {
1376
1330
Payload :: StacksTransactionSignature ( inner. try_into ( ) ?)
1377
1331
}
1378
- proto:: signer_message:: Payload :: BitcoinTransactionSignRequest ( inner) => {
1379
- Payload :: BitcoinTransactionSignRequest ( inner. try_into ( ) ?)
1380
- }
1381
- proto:: signer_message:: Payload :: BitcoinTransactionSignAck ( inner) => {
1382
- Payload :: BitcoinTransactionSignAck ( inner. try_into ( ) ?)
1383
- }
1384
1332
proto:: signer_message:: Payload :: WstsMessage ( inner) => {
1385
1333
Payload :: WstsMessage ( inner. try_into ( ) ?)
1386
1334
}
@@ -1695,8 +1643,6 @@ impl codec::ProtoSerializable for SignerMessage {
1695
1643
Payload :: SignerWithdrawalDecision ( _) => "SBTC_SIGNER_WITHDRAWAL_DECISION" ,
1696
1644
Payload :: StacksTransactionSignRequest ( _) => "SBTC_STACKS_TRANSACTION_SIGN_REQUEST" ,
1697
1645
Payload :: StacksTransactionSignature ( _) => "SBTC_STACKS_TRANSACTION_SIGNATURE" ,
1698
- Payload :: BitcoinTransactionSignRequest ( _) => "SBTC_BITCOIN_TRANSACTION_SIGN_REQUEST" ,
1699
- Payload :: BitcoinTransactionSignAck ( _) => "SBTC_BITCOIN_TRANSACTION_SIGN_ACK" ,
1700
1646
Payload :: WstsMessage ( _) => "SBTC_WSTS_MESSAGE" ,
1701
1647
Payload :: BitcoinPreSignRequest ( _) => "SBTC_BITCOIN_PRE_SIGN_REQUEST" ,
1702
1648
Payload :: BitcoinPreSignAck ( _) => "SBTC_BITCOIN_PRE_SIGN_ACK" ,
@@ -2125,7 +2071,6 @@ mod tests {
2125
2071
#[ test_case( PhantomData :: <( StacksPrincipal , proto:: StacksPrincipal ) >; "StacksPrincipal" ) ]
2126
2072
#[ test_case( PhantomData :: <( SignerDepositDecision , proto:: SignerDepositDecision ) >; "SignerDepositDecision" ) ]
2127
2073
#[ test_case( PhantomData :: <( SignerWithdrawalDecision , proto:: SignerWithdrawalDecision ) >; "SignerWithdrawalDecision" ) ]
2128
- #[ test_case( PhantomData :: <( BitcoinTransactionSignAck , proto:: BitcoinTransactionSignAck ) >; "BitcoinTransactionSignAck" ) ]
2129
2074
#[ test_case( PhantomData :: <( StacksTransactionSignature , proto:: StacksTransactionSignature ) >; "StacksTransactionSignature" ) ]
2130
2075
#[ test_case( PhantomData :: <( CompleteDepositV1 , proto:: CompleteDeposit ) >; "CompleteDeposit" ) ]
2131
2076
#[ test_case( PhantomData :: <( AcceptWithdrawalV1 , proto:: AcceptWithdrawal ) >; "AcceptWithdrawal" ) ]
@@ -2134,7 +2079,6 @@ mod tests {
2134
2079
#[ test_case( PhantomData :: <( SmartContract , proto:: SmartContract ) >; "SmartContract" ) ]
2135
2080
#[ test_case( PhantomData :: <( Payload , proto:: Payload ) >; "Payload" ) ]
2136
2081
#[ test_case( PhantomData :: <( StacksTransactionSignRequest , proto:: StacksTransactionSignRequest ) >; "StacksTransactionSignRequest" ) ]
2137
- #[ test_case( PhantomData :: <( BitcoinTransactionSignRequest , proto:: BitcoinTransactionSignRequest ) >; "BitcoinTransactionSignRequest" ) ]
2138
2082
#[ test_case( PhantomData :: <( WstsMessage , proto:: WstsMessage ) >; "WstsMessage" ) ]
2139
2083
#[ test_case( PhantomData :: <( SignerMessage , proto:: SignerMessage ) >; "SignerMessage" ) ]
2140
2084
#[ test_case( PhantomData :: <( Signed <SignerMessage >, proto:: Signed ) >; "Signed" ) ]
0 commit comments