Skip to content

Commit 958e7d5

Browse files
borngracedborngraced
committed
cargo fmt
1 parent f4851e1 commit 958e7d5

File tree

4 files changed

+27
-29
lines changed

4 files changed

+27
-29
lines changed

‎mm2src/coins/utxo/bch.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ use crate::{coin_balance, BlockHeightAndTime, CanRefundHtlc, CheckIfMyPaymentSen
1717
CoinWithDerivationMethod, CoinWithPrivKeyPolicy, ConfirmPaymentInput, DexFee, GetWithdrawSenderAddress,
1818
IguanaBalanceOps, IguanaPrivKey, MakerSwapTakerCoin, MmCoinEnum, NegotiateSwapContractAddrErr,
1919
PaymentInstructionArgs, PaymentInstructions, PaymentInstructionsErr, PrivKeyBuildPolicy,
20-
RawTransactionFut, RefundError, RefundPaymentArgs, RefundResult,
21-
SearchForSwapTxSpendInput, SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SignRawTransactionRequest,
22-
SignatureResult, SpendPaymentArgs, SwapOps, TakerSwapMakerCoin, TradePreimageValue, TransactionFut,
23-
TransactionResult, TransactionType, TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod,
24-
ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr,
25-
ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, ValidateWatcherSpendInput,
26-
VerificationResult, WaitForHTLCTxSpendArgs, WatcherOps, WatcherReward, WatcherRewardError,
27-
WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
20+
RawTransactionFut, RefundError, RefundPaymentArgs, RefundResult, SearchForSwapTxSpendInput,
21+
SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SignRawTransactionRequest, SignatureResult,
22+
SpendPaymentArgs, SwapOps, TakerSwapMakerCoin, TradePreimageValue, TransactionFut, TransactionResult,
23+
TransactionType, TxFeeDetails, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
24+
ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
25+
ValidatePaymentFut, ValidatePaymentInput, ValidateWatcherSpendInput, VerificationResult,
26+
WaitForHTLCTxSpendArgs, WatcherOps, WatcherReward, WatcherRewardError, WatcherSearchForSwapTxSpendInput,
27+
WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
2828
use common::executor::{AbortableSystem, AbortedError};
2929
use common::log::warn;
3030
use derive_more::Display;

‎mm2src/coins/utxo/qtum.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ use crate::{eth, CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinBalance, CoinWithD
2626
CoinWithPrivKeyPolicy, ConfirmPaymentInput, DelegationError, DelegationFut, DexFee,
2727
GetWithdrawSenderAddress, IguanaBalanceOps, IguanaPrivKey, MakerSwapTakerCoin, MmCoinEnum,
2828
NegotiateSwapContractAddrErr, PaymentInstructionArgs, PaymentInstructions, PaymentInstructionsErr,
29-
PrivKeyBuildPolicy, RawTransactionResult, RefundError, RefundPaymentArgs,
30-
RefundResult, SearchForSwapTxSpendInput, SendMakerPaymentSpendPreimageInput, SendPaymentArgs,
31-
SignRawTransactionRequest, SignatureResult, SpendPaymentArgs, StakingInfosFut, SwapOps,
32-
TakerSwapMakerCoin, TradePreimageValue, TransactionFut, TransactionResult, TxMarshalingErr,
33-
UnexpectedDerivationMethod, ValidateAddressResult, ValidateFeeArgs, ValidateInstructionsErr,
34-
ValidateOtherPubKeyErr, ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput,
35-
ValidateWatcherSpendInput, VerificationResult, WaitForHTLCTxSpendArgs, WatcherOps, WatcherReward,
36-
WatcherRewardError, WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput,
37-
WatcherValidateTakerFeeInput, WithdrawFut};
29+
PrivKeyBuildPolicy, RawTransactionResult, RefundError, RefundPaymentArgs, RefundResult,
30+
SearchForSwapTxSpendInput, SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SignRawTransactionRequest,
31+
SignatureResult, SpendPaymentArgs, StakingInfosFut, SwapOps, TakerSwapMakerCoin, TradePreimageValue,
32+
TransactionFut, TransactionResult, TxMarshalingErr, UnexpectedDerivationMethod, ValidateAddressResult,
33+
ValidateFeeArgs, ValidateInstructionsErr, ValidateOtherPubKeyErr, ValidatePaymentError,
34+
ValidatePaymentFut, ValidatePaymentInput, ValidateWatcherSpendInput, VerificationResult,
35+
WaitForHTLCTxSpendArgs, WatcherOps, WatcherReward, WatcherRewardError, WatcherSearchForSwapTxSpendInput,
36+
WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
3837
use common::executor::{AbortableSystem, AbortedError};
3938
use ethereum_types::H160;
4039
use futures::{FutureExt, TryFutureExt};

‎mm2src/coins/utxo/utxo_standard.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,18 @@ use crate::{CanRefundHtlc, CheckIfMyPaymentSentArgs, CoinBalance, CoinWithDeriva
2525
ConfirmPaymentInput, DexFee, FundingTxSpend, GenPreimageResult, GenTakerFundingSpendArgs,
2626
GenTakerPaymentSpendArgs, GetWithdrawSenderAddress, IguanaBalanceOps, IguanaPrivKey, MakerCoinSwapOpsV2,
2727
MakerSwapTakerCoin, MmCoinEnum, NegotiateSwapContractAddrErr, PaymentInstructionArgs, PaymentInstructions,
28-
PaymentInstructionsErr, PrivKeyBuildPolicy, RawTransactionResult, RefundError, RefundFundingSecretArgs, RefundMakerPaymentArgs,
29-
RefundPaymentArgs, RefundResult, SearchForFundingSpendErr, SearchForSwapTxSpendInput,
30-
SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput, SendPaymentArgs, SendTakerFundingArgs,
31-
SignRawTransactionRequest, SignatureResult, SpendMakerPaymentArgs, SpendPaymentArgs, SwapOps,
32-
SwapTxTypeWithSecretHash, TakerCoinSwapOpsV2, TakerSwapMakerCoin, ToBytes, TradePreimageValue,
28+
PaymentInstructionsErr, PrivKeyBuildPolicy, RawTransactionResult, RefundError, RefundFundingSecretArgs,
29+
RefundMakerPaymentArgs, RefundPaymentArgs, RefundResult, SearchForFundingSpendErr,
30+
SearchForSwapTxSpendInput, SendMakerPaymentArgs, SendMakerPaymentSpendPreimageInput, SendPaymentArgs,
31+
SendTakerFundingArgs, SignRawTransactionRequest, SignatureResult, SpendMakerPaymentArgs, SpendPaymentArgs,
32+
SwapOps, SwapTxTypeWithSecretHash, TakerCoinSwapOpsV2, TakerSwapMakerCoin, ToBytes, TradePreimageValue,
3333
TransactionFut, TransactionResult, TxMarshalingErr, TxPreimageWithSig, ValidateAddressResult,
3434
ValidateFeeArgs, ValidateInstructionsErr, ValidateMakerPaymentArgs, ValidateOtherPubKeyErr,
3535
ValidatePaymentError, ValidatePaymentFut, ValidatePaymentInput, ValidateSwapV2TxResult,
36-
ValidateTakerFundingArgs,
37-
ValidateTakerFundingSpendPreimageResult, ValidateTakerPaymentSpendPreimageResult,
38-
ValidateWatcherSpendInput, VerificationResult, WaitForHTLCTxSpendArgs, WaitForTakerPaymentSpendError,
39-
WatcherOps, WatcherReward, WatcherRewardError, WatcherSearchForSwapTxSpendInput,
40-
WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
36+
ValidateTakerFundingArgs, ValidateTakerFundingSpendPreimageResult,
37+
ValidateTakerPaymentSpendPreimageResult, ValidateWatcherSpendInput, VerificationResult,
38+
WaitForHTLCTxSpendArgs, WaitForTakerPaymentSpendError, WatcherOps, WatcherReward, WatcherRewardError,
39+
WatcherSearchForSwapTxSpendInput, WatcherValidatePaymentInput, WatcherValidateTakerFeeInput, WithdrawFut};
4140
use common::executor::{AbortableSystem, AbortedError};
4241
use futures::{FutureExt, TryFutureExt};
4342
use mm2_metrics::MetricsArc;

‎mm2src/trezor/src/eth/eth_command.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn get_eth_token_def(address_bytes: &[u8], chain_id: ChainId) -> Option<Vec<u8>>
5050
ETH_TOKEN_DEFS
5151
.iter()
5252
.find(|(address, def)| address == &&address_bytes && def.0 == chain_id)
53-
.map(|found| found.1.1.to_vec())
53+
.map(|found| found.1 .1.to_vec())
5454
}
5555

5656
/// trim leading zeros in array
@@ -210,7 +210,7 @@ fn extract_eth_signature(tx_request: &proto_ethereum::EthereumTxRequest) -> Trez
210210
&H256::from_slice(s.as_slice()),
211211
v_refined,
212212
))
213-
}
213+
},
214214
(_, _, _) => Err(MmError::new(TrezorError::Failure(OperationFailure::InvalidSignature))),
215215
}
216216
}

0 commit comments

Comments
 (0)