Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
silkaj
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
python
silkaj
Commits
19896c30
Commit
19896c30
authored
4 years ago
by
Moul
Browse files
Options
Downloads
Patches
Plain Diff
[enh] tx: Rework confirmation fields titles
parent
d576ab0c
No related branches found
No related tags found
2 merge requests
!146
Merge dev into master branch to complete v0.8.0 development cycle
,
!144
Rework tables fields
Pipeline
#9864
passed
4 years ago
Stage: checks
Stage: tests
Stage: coverage
Stage: deploy
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
silkaj/tx.py
+7
-7
7 additions, 7 deletions
silkaj/tx.py
tests/test_unit_tx.py
+7
-7
7 additions, 7 deletions
tests/test_unit_tx.py
with
14 additions
and
14 deletions
silkaj/tx.py
+
7
−
7
View file @
19896c30
...
...
@@ -238,35 +238,35 @@ async def transaction_confirmation(
# display account situation
display_amount
(
tx
,
"
pubkey
'
s balance before tx
"
,
"
Initial balance
"
,
pubkey_amount
,
ud_value
,
currency_symbol
,
)
display_amount
(
tx
,
"
t
otal transaction amount
"
,
"
T
otal transaction amount
"
,
total_tx_amount
,
ud_value
,
currency_symbol
,
)
display_amount
(
tx
,
"
pubkey
'
s b
alance after t
x
"
,
"
B
alance after t
ransaction
"
,
(
pubkey_amount
-
total_tx_amount
),
ud_value
,
currency_symbol
,
)
await
display_pubkey
(
tx
,
"
f
rom
"
,
issuer_pubkey
)
await
display_pubkey
(
tx
,
"
F
rom
"
,
issuer_pubkey
)
# display outputs and amounts
for
outputAddress
,
tx_amount
in
zip
(
outputAddresses
,
tx_amounts
):
await
display_pubkey
(
tx
,
"
t
o
"
,
outputAddress
)
await
display_pubkey
(
tx
,
"
T
o
"
,
outputAddress
)
await
sleep
(
ASYNC_SLEEP
)
display_amount
(
tx
,
"
a
mount
"
,
tx_amount
,
ud_value
,
currency_symbol
)
display_amount
(
tx
,
"
A
mount
"
,
tx_amount
,
ud_value
,
currency_symbol
)
# display last informations
if
outputBackChange
:
await
display_pubkey
(
tx
,
"
Backchange
"
,
outputBackChange
)
tx
.
append
([
"
c
omment
"
,
comment
])
tx
.
append
([
"
C
omment
"
,
comment
])
return
tx
...
...
This diff is collapsed.
Click to expand it.
tests/test_unit_tx.py
+
7
−
7
View file @
19896c30
...
...
@@ -169,34 +169,34 @@ async def test_transaction_confirmation(
# display account situation
display_amount
(
expected
,
"
pubkey
'
s balance before tx
"
,
"
Initial balance
"
,
pubkey_balance
,
ud_value
,
currency_symbol
,
)
display_amount
(
expected
,
"
t
otal transaction amount
"
,
"
T
otal transaction amount
"
,
total_tx_amount
,
ud_value
,
currency_symbol
,
)
display_amount
(
expected
,
"
pubkey
'
s b
alance after t
x
"
,
"
B
alance after t
ransaction
"
,
(
pubkey_balance
-
total_tx_amount
),
ud_value
,
currency_symbol
,
)
await
display_pubkey
(
expected
,
"
f
rom
"
,
issuer_pubkey
)
await
display_pubkey
(
expected
,
"
F
rom
"
,
issuer_pubkey
)
# display recipients and amounts
for
outputAddress
,
tx_amount
in
zip
(
outputAddresses
,
tx_amounts
):
await
display_pubkey
(
expected
,
"
t
o
"
,
outputAddress
)
display_amount
(
expected
,
"
a
mount
"
,
tx_amount
,
ud_value
,
currency_symbol
)
await
display_pubkey
(
expected
,
"
T
o
"
,
outputAddress
)
display_amount
(
expected
,
"
A
mount
"
,
tx_amount
,
ud_value
,
currency_symbol
)
# display backchange and comment
if
outputBackChange
:
await
display_pubkey
(
expected
,
"
Backchange
"
,
outputBackChange
)
expected
.
append
([
"
c
omment
"
,
comment
])
expected
.
append
([
"
C
omment
"
,
comment
])
# asserting
tx
=
await
transaction_confirmation
(
...
...
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