diff --git a/community_server/tests/Fixture/StateUserTransactionsFixture.php b/community_server/tests/Fixture/StateUserTransactionsFixture.php index 37a132eb5..605e10e5b 100644 --- a/community_server/tests/Fixture/StateUserTransactionsFixture.php +++ b/community_server/tests/Fixture/StateUserTransactionsFixture.php @@ -46,12 +46,12 @@ class StateUserTransactionsFixture extends BaseTestFixture [8, 4, 4, 2, 0, '2021-04-14 00:00:00'], [23, 1, 5, 2, 0, '2021-04-14 09:01:07'], [24, 4, 5, 2, 0, '2021-04-14 09:01:07'], - [25, 4, 6, 2, 0, '2021-04-14 09:02:28'], - [26, 1, 6, 2, 0, '2021-04-14 09:02:28'], - [27, 4, 7, 2, 0, '2021-04-14 09:28:46'], - [28, 1, 7, 2, 0, '2021-04-14 09:28:46'], - [29, 4, 8, 2, 0, '2021-04-14 09:31:28'], - [30, 1, 8, 2, 0, '2021-04-14 09:31:28'] + [25, 4, 7, 2, 0, '2021-04-14 09:02:28'], + [26, 1, 7, 2, 0, '2021-04-14 09:02:28'], + [27, 4, 8, 2, 0, '2021-04-14 09:28:46'], + [28, 1, 8, 2, 0, '2021-04-14 09:28:46'], + [29, 4, 9, 2, 0, '2021-04-14 09:31:28'], + [30, 1, 9, 2, 0, '2021-04-14 09:31:28'] ]; $this->records = $this->sqlEntrysToRecords($sql, $this->fields); parent::init(); diff --git a/community_server/tests/Fixture/TransactionSendCoinsFixture.php b/community_server/tests/Fixture/TransactionSendCoinsFixture.php index a109dfd7f..c186ccf8e 100644 --- a/community_server/tests/Fixture/TransactionSendCoinsFixture.php +++ b/community_server/tests/Fixture/TransactionSendCoinsFixture.php @@ -43,9 +43,9 @@ class TransactionSendCoinsFixture extends BaseTestFixture [2, 3, '0000000000000000000000000000000000000000000000000000000000000000', 1, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 4, 1000000, 6254699], [3, 4, '0000000000000000000000000000000000000000000000000000000000000000', 1, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 4, 100000, 7027197], [11, 5, '0000000000000000000000000000000000000000000000000000000000000000', 1, 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2', 4, 100000, 6922113], - [12, 6, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 9212951], - [13, 7, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 9112627], - [14, 8, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 8912594] + [12, 7, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 9212951], + [13, 8, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 9112627], + [14, 9, '0000000000000000000000000000000000000000000000000000000000000000', 4, 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f', 1, 100000, 8912594] ]; $this->records = $this->sqlEntrysToRecords($sql, $this->fields); diff --git a/community_server/tests/Fixture/TransactionSignaturesFixture.php b/community_server/tests/Fixture/TransactionSignaturesFixture.php index 710f055a0..9a5bbecee 100644 --- a/community_server/tests/Fixture/TransactionSignaturesFixture.php +++ b/community_server/tests/Fixture/TransactionSignaturesFixture.php @@ -41,9 +41,9 @@ class TransactionSignaturesFixture extends BaseTestFixture [3, 3, 'c70f124feaaea02194d22a5f597963ed3e430343122a0952877854766fe37a709f92b39510de2aae494ef11abe743cd59f08f971b1e0e36f4c333990453d8b0d', 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f'], [4, 4, 'a65b39e51ab6191c51d5629bbcefd30f85f801efbb14e1c635c519e97abe217a248820fa1fc6aef56227c9d888c1919bc92471d5d7ae3522c9c50fba9f0d8402', 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f'], [5, 5, 'a65b39e51ab6191c51d5629bbcefd30f85f801efbb14e1c635c519e97abe217a248820fa1fc6aef56227c9d888c1919bc92471d5d7ae3522c9c50fba9f0d8402', 'f7f4a49a4ac10379f8b9ddcb731c4d9ec495e6edd16075f52672cd25e3179f0f'], - [6, 6, 'c233726674bff9bfb8ccb98bf358c6bc701825d971ece915d3c3a3de98886d1d13ee2f773cd9fc4ccbe543ac17be0d780ebead23a0dbf4ec814f7bae2efb9c0e', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'], - [7, 7, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'], - [8, 8, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'] + [6, 7, 'c233726674bff9bfb8ccb98bf358c6bc701825d971ece915d3c3a3de98886d1d13ee2f773cd9fc4ccbe543ac17be0d780ebead23a0dbf4ec814f7bae2efb9c0e', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'], + [7, 8, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'], + [8, 9, '83ab780535883ec53ee76d0f68db0e1596418c9e100c806a4d4655d4dedf589d54a6319a2795dabab301e212b52f0dafb2725b7583447f19e47cb417d188a107', 'e3369de3623ce8446d0424c4013e7a1d71a2671ae3d7bf1e798ebf0665d145f2'] ]; $this->records = $this->sqlEntrysToRecords($sql, $this->fields); parent::init(); diff --git a/community_server/tests/Fixture/TransactionsFixture.php b/community_server/tests/Fixture/TransactionsFixture.php index befafc16b..8c38f0657 100644 --- a/community_server/tests/Fixture/TransactionsFixture.php +++ b/community_server/tests/Fixture/TransactionsFixture.php @@ -44,9 +44,10 @@ class TransactionsFixture extends BaseTestFixture [3, NULL, 2, '4e2235f208edaf5cbb285955732022a625cf1e100eb629c56896d2fbfb8b34e800000000000000000000000000000000', 'test', '2021-04-12 00:00:00', 1], [4, NULL, 2, 'fc6e69696beb7c56ad7c511fc3999f954411427bec810184b70c092911deae1900000000000000000000000000000000', 'test time', '2021-04-14 00:00:00', 1], [5, NULL, 2, 'a7149ebc0d6cd8c061906dafe05e13689b51642a41100d0ec7bb6cd2dcafdc1800000000000000000000000000000000', 'test time', '2021-04-14 09:01:07', 1], - [6, NULL, 2, '2e3c3ab3e42c06f2ecb12f61c970712467d8ad9ddfa16fa58dd76492e5924b7d00000000000000000000000000000000', 'test time 3', '2021-04-14 09:02:28', 1], - [7, NULL, 2, 'c2c6354d77ff371daeee25fce9c947748b53d3d6b8398a92bd681923cfd2057100000000000000000000000000000000', 'test login crash', '2021-04-14 09:28:46', 1], - [8, NULL, 2, '5a8cbf1aaac06b00b2951ff39983cb2ca9a1e6710d72c8e5067278dc679a823100000000000000000000000000000000', 'test login crash', '2021-04-14 09:31:28', 1] + [6, NULL, 9, '', '', '2021-04-14 09:02:00', 1], + [7, NULL, 2, '2e3c3ab3e42c06f2ecb12f61c970712467d8ad9ddfa16fa58dd76492e5924b7d00000000000000000000000000000000', 'test time 3', '2021-04-14 09:02:28', 1], + [8, NULL, 2, 'c2c6354d77ff371daeee25fce9c947748b53d3d6b8398a92bd681923cfd2057100000000000000000000000000000000', 'test login crash', '2021-04-14 09:28:46', 1], + [9, NULL, 2, '5a8cbf1aaac06b00b2951ff39983cb2ca9a1e6710d72c8e5067278dc679a823100000000000000000000000000000000', 'test login crash', '2021-04-14 09:31:28', 1] ]; $this->records = $this->sqlEntrysToRecords($sql, $this->fields); parent::init(); diff --git a/community_server/tests/TestCase/Controller/AppRequestControllerTest.php b/community_server/tests/TestCase/Controller/AppRequestControllerTest.php index a374ae878..f5939d2eb 100644 --- a/community_server/tests/TestCase/Controller/AppRequestControllerTest.php +++ b/community_server/tests/TestCase/Controller/AppRequestControllerTest.php @@ -57,8 +57,8 @@ class AppRequestControllerTest extends TestCase $response = $this->getAndParseWithoutCompare('/api/get-balance/' . $session_id); $this->assertEquals('success', $response->state); - $this->assertEquals(9100000, $response->balance); - $this->assertLessThan(9100000, $response->decay); + $this->assertEquals(9099652, $response->balance); + $this->assertLessThan(9099652, $response->decay); } @@ -94,8 +94,8 @@ class AppRequestControllerTest extends TestCase $response = $this->getAndParseWithoutCompare('/api/get-balance/' . $session_id); $this->assertEquals('success', $response->state); - $this->assertEquals(10900000, $response->balance); - $this->assertLessThan(10900000, $response->decay); + $this->assertEquals(10899568, $response->balance); + $this->assertLessThan(10899568, $response->decay); } public function testGetBalanceInvalidSession() @@ -202,7 +202,7 @@ class AppRequestControllerTest extends TestCase "email": "test3.yahoo.com" }, { - "transaction_id": 6, + "transaction_id": 7, "date": "2021-04-14T09:02:28+00:00", "memo": "test time 3", "balance": 100000, @@ -212,9 +212,23 @@ class AppRequestControllerTest extends TestCase "email": "test3.yahoo.com" }, { - "transaction_id": 7, + "transaction_id": 8, "date": "2021-04-14T09:28:46+00:00", "memo": "test login crash", + "decay": { + "balance": 309, + "decay_duration": "0 days, 00 hours, 26 minutes, 18 seconds" + }, + "balance": 100000, + "type": "receive", + "pubkey": "0000000000000000000000000000000000000000000000000000000000000000", + "name": "Samuel Schmied", + "email": "test3.yahoo.com" + }, + { + "transaction_id": 9, + "date": "2021-04-14T09:31:28+00:00", + "memo": "test login crash", "balance": 100000, "type": "receive", "pubkey": "0000000000000000000000000000000000000000000000000000000000000000", @@ -222,23 +236,19 @@ class AppRequestControllerTest extends TestCase "email": "test3.yahoo.com" }, { - "transaction_id": 8, - "date": "2021-04-14T09:31:28+00:00", - "memo": "test login crash", - "balance": 100000, - "type": "receive", - "pubkey": "0000000000000000000000000000000000000000000000000000000000000000", - "name": "Samuel Schmied", - "email": "test3.yahoo.com" + "type": "decay", + "balance": 1207829, + "decay_duration": "on 14.04.21", + "memo": "" } ], "transactionExecutingCount": 0, "count": 7, "gdtSum": 180000, - "timeUsed": 0.7237420082092285, - "decay_date": "2021-06-22T08:54:43+00:00", - "balance": 9100000, - "decay": 9100000 + "timeUsed": 0.35933995246887209, + "decay_date": "2021-06-28T09:17:23+00:00", + "balance": 9099652, + "decay": 7891823 }'; $this->getAndParse('/api/list-transactions/', json_decode($expectedResult, true)); } @@ -276,6 +286,14 @@ class AppRequestControllerTest extends TestCase $expected[$field] = $json->$field; } } + // decay balance variy always + if(isset($expected['transactions'])) { + foreach($expected['transactions'] as $i => $transaction) { + if(isset($transaction['type']) && isset($transaction['balance']) && $transaction['type'] == 'decay') { + $expected['transactions'][$i]['balance'] = $json->transactions[$i]['balance']; + } + } + } $expected = json_encode($expected); }