From 8c9e540637d2cd3676c374dac866465e78f77ceb Mon Sep 17 00:00:00 2001
From: matograine <tom.ngr@zaclys.net>
Date: Mon, 26 Apr 2021 16:59:35 +0200
Subject: [PATCH] [mod] #344 use pendulum in silkaj.cert
---
silkaj/cert.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/silkaj/cert.py b/silkaj/cert.py
index 595c3bb4..8df2faa8 100644
--- a/silkaj/cert.py
+++ b/silkaj/cert.py
@@ -17,6 +17,7 @@ along with Silkaj. If not, see <https://www.gnu.org/licenses/>.
import sys
import click
+from pendulum import from_timestamp
from time import time
from tabulate import tabulate
from duniterpy.api import bma
@@ -28,7 +29,7 @@ from silkaj.network_tools import ClientInstance
from silkaj.blockchain_tools import BlockchainParams, HeadBlock
from silkaj.license import license_approval
from silkaj import wot, tui
-from silkaj.constants import SUCCESS_EXIT_STATUS
+from silkaj.constants import SUCCESS_EXIT_STATUS, DATE, ALL
from silkaj.crypto_tools import is_pubkey_and_check
@@ -108,8 +109,9 @@ async def pre_checks(client, issuer_pubkey, pubkey_to_certify):
# ĞT: 0<–>4.8m - 4.8m + 12.5d
renewable = cert["expiresIn"] - params["sigValidity"] + params["sigReplay"]
if renewable > 0:
- renewable_date = tui.convert_time(time() + renewable, "date")
- message_exit("Certification renewable the " + renewable_date)
+ renew_ts = time() + renewable
+ renewable_date = from_timestamp(renew_ts).format(DATE)
+ message_exit("Certification renewable from " + renewable_date)
# Check if the certification is already in the pending certifications
for pending_cert in req["pendingCerts"]:
@@ -127,9 +129,8 @@ async def certification_confirmation(
idty_timestamp = idty_to_certify["meta"]["timestamp"]
block_uid_idty = block_uid(idty_timestamp)
block = await client(bma.blockchain.block, block_uid_idty.number)
- block_uid_date = (
- ": #" + idty_timestamp[:15] + "… " + tui.convert_time(block["time"], "all")
- )
+ timestamp_date = from_timestamp(block["time"]).format(ALL)
+ block_uid_date = f": #{idty_timestamp[:15]}… {timestamp_date}"
cert.append(["ID", issuer["uid"], "–>", idty_to_certify["uid"] + block_uid_date])
cert.append(
[
@@ -140,8 +141,8 @@ async def certification_confirmation(
]
)
params = await BlockchainParams().params
- cert_begins = tui.convert_time(time(), "date")
- cert_ends = tui.convert_time(time() + params["sigValidity"], "date")
+ cert_begins = from_timestamp(time()).format(DATE)
+ cert_ends = from_timestamp(time() + params["sigValidity"]).format(DATE)
cert.append(["Valid", cert_begins, "—>", cert_ends])
click.echo(tabulate(cert, tablefmt="fancy_grid"))
if not ctx.obj["DISPLAY_DOCUMENT"]:
--
GitLab