From dd190c1cb205a628a2c511706c8d2cb1459124a7 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 25 Mar 2025 13:31:31 +0100
Subject: [PATCH] Use CENT_MULT_TO_UNIT instead of constant hanging around
(#193)
---
silkaj/money/history.py | 10 +++++-----
silkaj/money/tools.py | 3 ++-
silkaj/money/transfer.py | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/silkaj/money/history.py b/silkaj/money/history.py
index 5d8b18f0..216ae588 100644
--- a/silkaj/money/history.py
+++ b/silkaj/money/history.py
@@ -26,7 +26,7 @@ from duniterpy.api.client import Client
from duniterpy.documents.transaction import OutputSource, Transaction
from duniterpy.grammars.output import Condition
-from silkaj.constants import ALL, ALL_DIGITAL
+from silkaj.constants import ALL, ALL_DIGITAL, CENT_MULT_TO_UNIT
from silkaj.money import tools as mt
from silkaj.network import client_instance
from silkaj.public_key import (
@@ -107,7 +107,7 @@ def generate_header(pubkey: str, currency_symbol: str, ud_value: int) -> str:
balance_ud = round(balance[1] / ud_value, 2)
date = arrow.now().format(ALL)
return f"Transactions history from: {idty['uid']} {gen_pubkey_checksum(pubkey)}\n\
-Current balance: {balance[1] / 100} {currency_symbol}, {balance_ud} UD {currency_symbol} on {date}\n"
+Current balance: {balance[1] / CENT_MULT_TO_UNIT} {currency_symbol}, {balance_ud} UD {currency_symbol} on {date}\n"
def get_transactions_history(
@@ -207,7 +207,7 @@ def parse_received_tx(
full_pubkey,
)
amounts = tx_amount(received_tx, pubkey, received_func)[0]
- tx_list.append(amounts / 100)
+ tx_list.append(amounts / CENT_MULT_TO_UNIT)
tx_list.append(round(amounts / ud_value, 2))
tx_list.append(received_tx.comment)
received_txs_table.append(tx_list)
@@ -244,7 +244,7 @@ def parse_sent_tx(
total_amount, outputs = tx_amount(sent_tx, pubkey, sent_func)
if len(outputs) > 1:
tx_list.append("Total")
- amounts = str(total_amount / 100)
+ amounts = str(total_amount / CENT_MULT_TO_UNIT)
amounts_ud = str(round(total_amount / ud_value, 2))
else:
tx_list.append("")
@@ -254,7 +254,7 @@ def parse_sent_tx(
for i, output in enumerate(outputs):
if output_available(output.condition, ne, pubkey):
amounts += prefix(None, outputs, i) + str(
- neg(mt.amount_in_current_base(output)) / 100,
+ neg(mt.amount_in_current_base(output)) / CENT_MULT_TO_UNIT,
)
amounts_ud += prefix(None, outputs, i) + str(
round(neg(mt.amount_in_current_base(output)) / ud_value, 2),
diff --git a/silkaj/money/tools.py b/silkaj/money/tools.py
index 2e16ae13..d753caca 100644
--- a/silkaj/money/tools.py
+++ b/silkaj/money/tools.py
@@ -19,6 +19,7 @@ from typing import Union
from duniterpy.api import bma
from duniterpy.documents.transaction import InputSource, OutputSource
+from silkaj.constants import CENT_MULT_TO_UNIT
from silkaj.network import client_instance
from silkaj.public_key import gen_pubkey_checksum
from silkaj.wot import tools as wt
@@ -35,7 +36,7 @@ def display_amount(
Displays an amount in unit and relative reference.
"""
UD_amount = str(round((amount / ud_value), 2))
- unit_amount = str(amount / 100)
+ unit_amount = str(amount / CENT_MULT_TO_UNIT)
tx.append(
[
f"{message} (unit|relative)",
diff --git a/silkaj/money/transfer.py b/silkaj/money/transfer.py
index a0144cbf..0dabcecc 100644
--- a/silkaj/money/transfer.py
+++ b/silkaj/money/transfer.py
@@ -480,7 +480,7 @@ def generate_and_send_transaction(
print(" - From: " + gen_pubkey_checksum(issuers))
for tx_amount, outputAddress in zip(tx_amounts, outputAddresses):
display_sent_tx(outputAddress, tx_amount)
- print(" - Total: " + str(sum(tx_amounts) / 100))
+ print(" - Total: " + str(sum(tx_amounts) / CENT_MULT_TO_UNIT))
transaction = generate_transaction_document(
issuers,
@@ -499,7 +499,7 @@ def display_sent_tx(outputAddress: str, amount: int) -> None:
" - To: ",
gen_pubkey_checksum(outputAddress),
"\n - Amount: ",
- amount / 100,
+ amount / CENT_MULT_TO_UNIT,
)
--
GitLab