From 02ad9bde3e671a3566d68a6b968efe288e67d910 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 17 Nov 2022 13:53:48 -0300 Subject: Adapt to new seconds based time format --- .../java/net/taler/wallet/deposit/TransactionDepositComposable.kt | 2 +- .../main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt | 4 ++-- .../main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt | 4 ++-- .../main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt | 4 ++-- .../main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt | 4 ++-- .../test/java/net/taler/wallet/payment/PaymentResponsesTest.kt | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'wallet') diff --git a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt index aa75c56..7c5c7a2 100644 --- a/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt +++ b/wallet/src/main/java/net/taler/wallet/deposit/TransactionDepositComposable.kt @@ -82,7 +82,7 @@ fun TransactionDepositComposable(t: TransactionDeposit, onDelete: () -> Unit) { fun TransactionDepositComposablePreview() { val t = TransactionDeposit( transactionId = "transactionId", - timestamp = Timestamp(System.currentTimeMillis() - 360 * 60 * 1000), + timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), pending = true, depositGroupId = "fooBar", amountRaw = Amount.fromDouble("TESTKUDOS", 42.1337), diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt index 3179024..82a16be 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt @@ -81,13 +81,13 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: TransactionPeerPullCredit fun TransactionPeerPullCreditPreview() { val t = TransactionPeerPullCredit( transactionId = "transactionId", - timestamp = Timestamp(System.currentTimeMillis() - 360 * 60 * 1000), + timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), pending = true, exchangeBaseUrl = "https://exchange.example.org/", amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), amountEffective = Amount.fromDouble("TESTKUDOS", 42.1337), info = PeerInfoShort( - expiration = Timestamp(System.currentTimeMillis() + 60 * 60 * 1000), + expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", ), talerUri = "https://exchange.example.org/peer/pull/credit", diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt index 823126b..fc14ec1 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt @@ -61,13 +61,13 @@ fun TransactionPeerPullDebitComposable(t: TransactionPeerPullDebit) { fun TransactionPeerPullDebitPreview() { val t = TransactionPeerPullDebit( transactionId = "transactionId", - timestamp = Timestamp(System.currentTimeMillis() - 360 * 60 * 1000), + timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), pending = true, exchangeBaseUrl = "https://exchange.example.org/", amountRaw = Amount.fromDouble("TESTKUDOS", 42.1337), amountEffective = Amount.fromDouble("TESTKUDOS", 42.23), info = PeerInfoShort( - expiration = Timestamp(System.currentTimeMillis() + 60 * 60 * 1000), + expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", ), ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt index b986f57..ae8e7ac 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt @@ -61,13 +61,13 @@ fun TransactionPeerPushCreditComposable(t: TransactionPeerPushCredit) { fun TransactionPeerPushCreditPreview() { val t = TransactionPeerPushCredit( transactionId = "transactionId", - timestamp = Timestamp(System.currentTimeMillis() - 360 * 60 * 1000), + timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), pending = true, exchangeBaseUrl = "https://exchange.example.org/", amountRaw = Amount.fromDouble("TESTKUDOS", 42.23), amountEffective = Amount.fromDouble("TESTKUDOS", 42.1337), info = PeerInfoShort( - expiration = Timestamp(System.currentTimeMillis() + 60 * 60 * 1000), + expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", ), ) diff --git a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt index 18528f9..2eb1c86 100644 --- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt +++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt @@ -79,13 +79,13 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: TransactionPeerPushDebit) fun TransactionPeerPushDebitPreview() { val t = TransactionPeerPushDebit( transactionId = "transactionId", - timestamp = Timestamp(System.currentTimeMillis() - 360 * 60 * 1000), + timestamp = Timestamp.fromMillis(System.currentTimeMillis() - 360 * 60 * 1000), pending = true, exchangeBaseUrl = "https://exchange.example.org/", amountRaw = Amount.fromDouble("TESTKUDOS", 42.1337), amountEffective = Amount.fromDouble("TESTKUDOS", 42.23), info = PeerInfoShort( - expiration = Timestamp(System.currentTimeMillis() + 60 * 60 * 1000), + expiration = Timestamp.fromMillis(System.currentTimeMillis() + 60 * 60 * 1000), summary = "test invoice", ), talerUri = "https://exchange.example.org/peer/pull/credit", diff --git a/wallet/src/test/java/net/taler/wallet/payment/PaymentResponsesTest.kt b/wallet/src/test/java/net/taler/wallet/payment/PaymentResponsesTest.kt index da2378e..f1eaa76 100644 --- a/wallet/src/test/java/net/taler/wallet/payment/PaymentResponsesTest.kt +++ b/wallet/src/test/java/net/taler/wallet/payment/PaymentResponsesTest.kt @@ -42,16 +42,16 @@ class PaymentResponsesTest { "wire_method": "x-taler-bank", "order_id": "2020.240-01MD5F476HMXW", "timestamp": { - "t_ms": 1598538535000 + "t_s": 1598538535 }, "refund_deadline": { - "t_ms": 1598538835000 + "t_s": 1598538835 }, "pay_deadline": { - "t_ms": 1598538835000 + "t_s": 1598538835 }, "wire_transfer_deadline": { - "t_ms": 1598542135000 + "t_s": 1598542135 }, "max_wire_fee": "CHF:0.1", "max_fee": "CHF:0.1", -- cgit v1.2.3