Skip to content

Commit 8992682

Browse files
authored
Simplify get_depositable_tokens (#727)
1 parent e29fb20 commit 8992682

File tree

3 files changed

+152
-226
lines changed

3 files changed

+152
-226
lines changed

smart-contracts/osmosis/contracts/cl-vault/src/error.rs

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use cosmwasm_std::{
2-
CheckedFromRatioError, CheckedMultiplyRatioError, Coin, CoinFromStrError,
3-
ConversionOverflowError, Decimal256, Decimal256RangeExceeded, DivideByZeroError, OverflowError,
4-
StdError, Uint128,
2+
CheckedFromRatioError, CheckedMultiplyFractionError, CheckedMultiplyRatioError, Coin,
3+
CoinFromStrError, ConversionOverflowError, Decimal256, Decimal256RangeExceeded,
4+
DivideByZeroError, OverflowError, StdError, Uint128,
55
};
66
use cw_utils::PaymentError;
77
use prost::DecodeError;
@@ -150,21 +150,24 @@ pub enum ContractError {
150150
#[error("{0}")]
151151
ConversionOverflowError(#[from] ConversionOverflowError),
152152

153+
#[error("{0}")]
154+
CheckedMultiplyRatio(#[from] CheckedMultiplyRatioError),
155+
156+
#[error("{0}")]
157+
CheckedMultiplyFraction(#[from] CheckedMultiplyFractionError),
158+
153159
#[error("{0}")]
154160
DecodeError(#[from] DecodeError),
155161

156162
#[error("{0}")]
157163
CoinFromStrError(#[from] CoinFromStrError),
158164

159165
#[error("{0}")]
160-
MultiplyRatioError(#[from] CheckedFromRatioError),
166+
CheckedFromRatio(#[from] CheckedFromRatioError),
161167

162168
#[error("{0}")]
163169
DivideByZeroError(#[from] DivideByZeroError),
164170

165-
#[error("{0}")]
166-
CheckedMultiplyRatioError(#[from] CheckedMultiplyRatioError),
167-
168171
#[error("{0}")]
169172
Decimal256RangeExceededError(#[from] Decimal256RangeExceeded),
170173

0 commit comments

Comments
 (0)