Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
parity
Mirrored projects
polkadot
Commits
05de9ef1
Unverified
Commit
05de9ef1
authored
Aug 11, 2021
by
Alexander Popiak
Committed by
GitHub
Aug 11, 2021
Browse files
use WEIGHT_PER_SECOND in FixedRateOfFungible (#3611)
* use WEIGHT_PER_SECOND in FixedRateOfFungible * move import
parent
6a80a96f
Pipeline
#152304
passed with stages
in 41 minutes and 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
xcm/xcm-builder/src/weight.rs
View file @
05de9ef1
...
...
@@ -16,7 +16,7 @@
use
frame_support
::{
traits
::{
tokens
::
currency
::
Currency
as
CurrencyT
,
Get
,
OnUnbalanced
as
OnUnbalancedT
},
weights
::{
GetDispatchInfo
,
Weight
,
WeightToFeePolynomial
},
weights
::{
constants
::
WEIGHT_PER_SECOND
,
GetDispatchInfo
,
Weight
,
WeightToFeePolynomial
},
};
use
parity_scale_codec
::
Decode
;
use
sp_runtime
::
traits
::{
SaturatedConversion
,
Saturating
,
Zero
};
...
...
@@ -131,7 +131,6 @@ impl<T: Get<(MultiLocation, u128)>, R: TakeRevenue> WeightTrader
fn
buy_weight
(
&
mut
self
,
weight
:
Weight
,
payment
:
Assets
)
->
Result
<
Assets
,
Error
>
{
let
(
id
,
units_per_second
)
=
T
::
get
();
use
frame_support
::
weights
::
constants
::
WEIGHT_PER_SECOND
;
let
amount
=
units_per_second
*
(
weight
as
u128
)
/
(
WEIGHT_PER_SECOND
as
u128
);
let
unused
=
payment
.checked_sub
((
id
,
amount
)
.into
())
.map_err
(|
_
|
Error
::
TooExpensive
)
?
;
self
.0
=
self
.0
.saturating_add
(
weight
);
...
...
@@ -177,7 +176,6 @@ impl<T: Get<(AssetId, u128)>, R: TakeRevenue> WeightTrader for FixedRateOfFungib
fn
buy_weight
(
&
mut
self
,
weight
:
Weight
,
payment
:
Assets
)
->
Result
<
Assets
,
Error
>
{
let
(
id
,
units_per_second
)
=
T
::
get
();
use
frame_support
::
weights
::
constants
::
WEIGHT_PER_SECOND
;
let
amount
=
units_per_second
*
(
weight
as
u128
)
/
(
WEIGHT_PER_SECOND
as
u128
);
if
amount
==
0
{
return
Ok
(
payment
)
...
...
@@ -191,7 +189,7 @@ impl<T: Get<(AssetId, u128)>, R: TakeRevenue> WeightTrader for FixedRateOfFungib
fn
refund_weight
(
&
mut
self
,
weight
:
Weight
)
->
Option
<
MultiAsset
>
{
let
(
id
,
units_per_second
)
=
T
::
get
();
let
weight
=
weight
.min
(
self
.0
);
let
amount
=
units_per_second
*
(
weight
as
u128
)
/
1_000_000_000_000
u128
;
let
amount
=
units_per_second
*
(
weight
as
u128
)
/
(
WEIGHT_PER_SECOND
as
u128
)
;
self
.0
-=
weight
;
self
.1
=
self
.1
.saturating_sub
(
amount
);
if
amount
>
0
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment