Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Duniter v2S
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
rust
Duniter v2S
Commits
bbbcd3b4
Commit
bbbcd3b4
authored
3 years ago
by
Éloïs
Browse files
Options
Downloads
Patches
Plain Diff
rustfmt
parent
493d93b3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
integration-tests/tests/common/balances.rs
+5
-7
5 additions, 7 deletions
integration-tests/tests/common/balances.rs
integration-tests/tests/cucumber_tests.rs
+45
-26
45 additions, 26 deletions
integration-tests/tests/cucumber_tests.rs
with
50 additions
and
33 deletions
integration-tests/tests/common/balances.rs
+
5
−
7
View file @
bbbcd3b4
...
...
@@ -14,11 +14,11 @@
// You should have received a copy of the GNU Affero General Public License
// along with Substrate-Libre-Currency. If not, see <https://www.gnu.org/licenses/>.
use
super
::
*
;
use
super
::
node_runtime
::
runtime_types
::
gdev_runtime
;
use
super
::
node_runtime
::
runtime_types
::
pallet_balances
;
use
super
::
*
;
use
sp_keyring
::
AccountKeyring
;
use
subxt
::{
sp_runtime
::
MultiAddress
,
PairSigner
};
use
subxt
::{
sp_runtime
::
MultiAddress
,
PairSigner
};
pub
async
fn
set_balance
(
api
:
&
Api
,
...
...
@@ -26,10 +26,9 @@ pub async fn set_balance(
who
:
AccountKeyring
,
amount
:
u64
,
)
->
Result
<
()
>
{
let
_events
=
create_block_with_extrinsic
(
let
_events
=
create_block_with_extrinsic
(
&
client
,
api
.tx
()
api
.tx
()
.sudo
()
.sudo
(
gdev_runtime
::
Call
::
Balances
(
pallet_balances
::
pallet
::
Call
::
set_balance
{
...
...
@@ -80,8 +79,7 @@ pub async fn transfer_all(
let
_events
=
create_block_with_extrinsic
(
&
client
,
api
.tx
()
api
.tx
()
.balances
()
.transfer_all
(
to
.clone
()
.into
(),
false
)
.create_signed
(
&
from
,
())
...
...
This diff is collapsed.
Click to expand it.
integration-tests/tests/cucumber_tests.rs
+
45
−
26
View file @
bbbcd3b4
...
...
@@ -52,45 +52,55 @@ impl World for DuniterWorld {
}
fn
parse_amount
(
amount
:
u64
,
unit
:
&
str
)
->
(
u64
,
bool
)
{
match
unit
{
"ĞD"
=>
(
amount
*
100
,
false
),
"cĞD"
=>
(
amount
,
false
),
"UD"
=>
(
amount
*
1_000
,
true
),
"mUD"
=>
(
amount
,
true
),
_
=>
unreachable!
(),
}
match
unit
{
"ĞD"
=>
(
amount
*
100
,
false
),
"cĞD"
=>
(
amount
,
false
),
"UD"
=>
(
amount
*
1_000
,
true
),
"mUD"
=>
(
amount
,
true
),
_
=>
unreachable!
(),
}
}
#[given(regex
=
r"([a-zA-Z]+) have (\d+) (ĞD|cĞD|UD|mUD)"
)]
async
fn
who_have
(
world
:
&
mut
DuniterWorld
,
who
:
String
,
amount
:
u64
,
unit
:
String
)
->
Result
<
()
>
{
// Parse inputs
let
who
=
AccountKeyring
::
from_str
(
&
who
)
.expect
(
"unknown to"
);
let
(
mut
amount
,
is_ud
)
=
parse_amount
(
amount
,
&
unit
);
if
is_ud
{
let
current_ud_amount
=
world
.api
.storage
()
.universal_dividend
()
.current_ud_storage
(
None
)
.await
?
;
amount
=
(
amount
*
current_ud_amount
)
/
1_000
;
}
let
who
=
AccountKeyring
::
from_str
(
&
who
)
.expect
(
"unknown to"
);
let
(
mut
amount
,
is_ud
)
=
parse_amount
(
amount
,
&
unit
);
if
is_ud
{
let
current_ud_amount
=
world
.api
.storage
()
.universal_dividend
()
.current_ud_storage
(
None
)
.await
?
;
amount
=
(
amount
*
current_ud_amount
)
/
1_000
;
}
// Create {amount} ĞD for {who}
common
::
balances
::
set_balance
(
&
world
.api
,
&
world
.client
,
who
,
amount
)
.await
?
;
common
::
balances
::
set_balance
(
&
world
.api
,
&
world
.client
,
who
,
amount
)
.await
?
;
Ok
(())
}
#[when(regex
=
r"([a-zA-Z]+) send (\d+) (ĞD|cĞD|UD|mUD) to ([a-zA-Z]+)"
)]
async
fn
transfer
(
world
:
&
mut
DuniterWorld
,
from
:
String
,
amount
:
u64
,
unit
:
String
,
to
:
String
)
->
Result
<
()
>
{
async
fn
transfer
(
world
:
&
mut
DuniterWorld
,
from
:
String
,
amount
:
u64
,
unit
:
String
,
to
:
String
,
)
->
Result
<
()
>
{
// Parse inputs
let
from
=
AccountKeyring
::
from_str
(
&
from
)
.expect
(
"unknown from"
);
let
to
=
AccountKeyring
::
from_str
(
&
to
)
.expect
(
"unknown to"
);
let
(
amount
,
is_ud
)
=
parse_amount
(
amount
,
&
unit
);
let
(
amount
,
is_ud
)
=
parse_amount
(
amount
,
&
unit
);
if
is_ud
{
common
::
balances
::
transfer_ud
(
&
world
.api
,
&
world
.client
,
from
,
amount
,
to
)
.await
}
else
{
common
::
balances
::
transfer
(
&
world
.api
,
&
world
.client
,
from
,
amount
,
to
)
.await
}
if
is_ud
{
common
::
balances
::
transfer_ud
(
&
world
.api
,
&
world
.client
,
from
,
amount
,
to
)
.await
}
else
{
common
::
balances
::
transfer
(
&
world
.api
,
&
world
.client
,
from
,
amount
,
to
)
.await
}
}
#[when(regex
=
r"([a-zA-Z]+) sends all (?:his|her) (?:ĞDs?|DUs?) to ([a-zA-Z]+)"
)]
...
...
@@ -99,7 +109,7 @@ async fn send_all_to(world: &mut DuniterWorld, from: String, to: String) -> Resu
let
from
=
AccountKeyring
::
from_str
(
&
from
)
.expect
(
"unknown from"
);
let
to
=
AccountKeyring
::
from_str
(
&
to
)
.expect
(
"unknown to"
);
common
::
balances
::
transfer_all
(
&
world
.api
,
&
world
.client
,
from
,
to
)
.await
common
::
balances
::
transfer_all
(
&
world
.api
,
&
world
.client
,
from
,
to
)
.await
}
#[then(regex
=
r"([a-zA-Z]+) should have (\d+) ĞD"
)]
...
...
@@ -116,11 +126,20 @@ async fn should_have(world: &mut DuniterWorld, who: String, amount: u64) -> Resu
}
#[then(regex
=
r"current UD amount should be (\d+).(\d+)"
)]
async
fn
current_ud_amount_should_be
(
world
:
&
mut
DuniterWorld
,
amount
:
u64
,
cents
:
u64
)
->
Result
<
()
>
{
async
fn
current_ud_amount_should_be
(
world
:
&
mut
DuniterWorld
,
amount
:
u64
,
cents
:
u64
,
)
->
Result
<
()
>
{
// Parse inputs
let
expected_amount
=
amount
+
(
cents
*
100
);
let
current_ud_amount
=
world
.api
.storage
()
.universal_dividend
()
.current_ud_storage
(
None
)
.await
?
;
let
current_ud_amount
=
world
.api
.storage
()
.universal_dividend
()
.current_ud_storage
(
None
)
.await
?
;
assert_eq!
(
current_ud_amount
,
expected_amount
);
Ok
(())
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment