[1209-1] Remove old client's fucntions #600

ArtObr · 2018-03-29T18:08:55Z

Remove old client's fucntions and assosiated tests

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-992

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-992

…t_state_proof; problem with wrong bls keys Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1058

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…te_proof test Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1058

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-992

…n/INDY-1058 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1058 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1058

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr · 2018-04-03T14:53:13Z

Test this please

ArtObr · 2018-04-03T15:46:04Z

Test this please

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1209-1

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr · 2018-04-09T13:33:49Z

Test this please

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1209-1

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1209-1

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

dsurnin · 2018-04-18T05:30:20Z

plenum/test/blacklist/test_blacklist_client.py

    """
    Client should be not be blacklisted by node on sending an unsigned request
    """
-
+    client_name = poolTxnClientNames[0]


Test itself does not correspond to test description.
I think invalid signature is not the same as no signature.
SDK has a method to send msg without singing it, so generate request and send it without signature

Test rewritten

dsurnin · 2018-04-18T05:38:48Z

plenum/test/bls/helper.py

 def sdk_change_bls_key(looper, txnPoolNodeSet,
                       node,
                       sdk_pool_handle,
                       sdk_wallet_steward,
                       add_wrong=False,
-                       new_bls=None):
+                       new_bls=None,
+                       use_in_plenum=True):


I'm disagree with such a decision to make function behave differently depending the project it is called from
If we need it then split this func into two part

changing key - behavior is the same everywhere

check pool functional - is called as separate function after the first one finished. could be different for different modules.

dsurnin · 2018-04-18T05:41:05Z

plenum/test/bls/helper.py

+        sdk_ensure_pool_functional(looper, txnPoolNodeSet,
+                                   sdk_wallet_steward, sdk_pool_handle)
+    else:
+        sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_steward,


Create a function in the Node module with the same name as in Plenum - sdk_ensure_pool_functional - but Node specific check
call it where appropriate

Changed this way.

dsurnin · 2018-04-18T05:44:51Z

plenum/test/client/test_client.py

@@ -111,6 +111,7 @@ def testRequestFullRoundTrip(replied1, client1):


 # noinspection PyIncorrectDocstring
+@pytest.mark.skip(reason='sdk integration')


I think it could be deleted

dsurnin · 2018-04-18T05:49:44Z

plenum/test/client/test_client.py

@@ -127,6 +128,7 @@ def chk():


 # noinspection PyIncorrectDocstring
+@pytest.mark.skip(reason='sdk integration')


This test should be discussed

The test should be rewritten
send req, get and check resp
after that send the same req and check resp

dsurnin · 2018-04-18T06:23:42Z

plenum/test/storage/test_client_req_rep_store.py

+import pytest
+
+
+@pytest.mark.skip(reason='sdk integration')


I think it could be deleted

dsurnin · 2018-04-18T06:26:49Z

plenum/test/test_req_authenticator.py

@@ -38,7 +38,10 @@ def test_authenticator_registration(pre_reqs, registration):
    assert req_authnr.get_authnr_by_type(CoreAuthNr) == core_authnr


-def test_authentication(pre_reqs, registration, client1, wallet1):
+@pytest.mark.skip(reason='sdk integration')


why is it skipped?

dsurnin · 2018-04-18T06:33:29Z

plenum/test/view_change/test_6th_node_join_after_view_change_by_primary_restart.py

@@ -117,7 +117,7 @@ def test_6th_node_join_after_view_change_by_master_restart(

        timeout = waits.expectedPoolCatchupTime(nodeCount=len(pool_of_nodes))
        for node in pool_of_nodes:
-            looper.run(eventually(catchuped, node, timeout=2 * timeout))
+            looper.run(eventually(catchuped, node, timeout=3 * timeout))


Are you sure we need to increase it? Could you describe a problem?

Sometimes viewchange does not complete in time. So we need to wait longer.

dsurnin · 2018-04-18T06:34:46Z

plenum/test/client/test_client_sends_to_less_nodes.py

@@ -10,6 +12,7 @@


 # noinspection PyIncorrectDocstring
+@pytest.mark.skip(reason='sdk integration')


It should be discussed

Could be deleted

dsurnin · 2018-04-18T06:34:55Z

plenum/test/client/test_faulty_client_with_faulty_node.py

@@ -28,6 +28,7 @@ def nodeChangesRequest(txnPoolNodeSet):


 # noinspection PyIncorrectDocstring,PyUnusedLocal,PyShadowingNames
+@pytest.mark.skip(reason='sdk integration')


It should be discussed

Rewrite the test
do not change node modifications
just send req and check resp

dsurnin · 2018-04-18T07:42:06Z

plenum/test/client/test_client.py

@@ -127,6 +128,7 @@ def chk():


 # noinspection PyIncorrectDocstring
+@pytest.mark.skip(reason='sdk integration')


The test should be rewritten
send req, get and check resp
after that send the same req and check resp

dsurnin · 2018-04-18T07:42:37Z

plenum/test/client/test_client_sends_get_request_to_one_node.py



+@pytest.mark.skip(reason='sdk client cannot do that yet')


Could be deleted

dsurnin · 2018-04-18T07:43:01Z

plenum/test/client/test_client_sends_to_less_nodes.py

@@ -10,6 +12,7 @@


 # noinspection PyIncorrectDocstring
+@pytest.mark.skip(reason='sdk integration')


Could be deleted

dsurnin · 2018-04-18T07:45:27Z

plenum/test/client/test_faulty_client_with_faulty_node.py

@@ -28,6 +28,7 @@ def nodeChangesRequest(txnPoolNodeSet):


 # noinspection PyIncorrectDocstring,PyUnusedLocal,PyShadowingNames
+@pytest.mark.skip(reason='sdk integration')


Rewrite the test
do not change node modifications
just send req and check resp

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr · 2018-04-23T16:12:01Z

Test this please

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

…INDY-1209-1

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

* Initial test integration Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Two more files done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * new test Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * 4 more folders done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * two more files Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * some changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * More tests integrated. Problems: validator functions of client in test_state_proof; problem with wrong bls keys Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Initial commit Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Script fix. bls validation fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Fix for bls validation tests. Not done: update_incorrect test and state_proof test Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Only state_proof test left Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Tests integration done Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of Client1Connected. More test fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Import deletion. flake8 error fix. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * More changes to txnPoolNodeSet Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Changes in tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Remove pf TestNodeSet. Change of helper methods. Part 1. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Remove TestNodeSet from helper. part 2 Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * More tests integrated Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Functions fixes. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Fix for genesis txns Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * More tests integrated Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * primary_selection dependency fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Fixture fix for view_change Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * View change test fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Skips for merkle proof tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Skips for merkle proof tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Remove sendRandomRequest of old client. Part 1. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Review changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Review changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequest. Part 2. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Little error fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * waitReqNackFromPoolWithReason function deletion Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * waitRejectFromPoolWithReason function deletion Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * checkReqNack function deletion Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Two more fucntions deletion Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequests. Part 1. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequests. Part 2. send_reqs_to_nodes_and_verify_all_replies deleted. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequests. Part 3. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequest. Part 4. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of sendRandomRequests. Part 5. Deleted: ensure_pool_functional, NodeSetWithNodeAddedAfterSomeTxns, nodeCreatedAfterSomeTxns, newNodeCaughtUp. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Review changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix for test passing Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix for test passing Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Review change Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * deletion of send_signed_request Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Deletion of send_signed_request Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * deletion of waitForSufficientReplies. Part 1. Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * more changes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * fix Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little addition Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * some fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Changes in helper functions Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * Some changes for node's tests Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * deletions of client Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * fixes for test Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * little fixes Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * INDY-1209: fix test timeout Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * INDY-1209: Fix tests according to review Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * INDY-1209: Add functionality for skipping verkey in request Signed-off-by: ArtObr <artemobruchnikov@gmail.com> * INDY-1209: Reset timeout back Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 30 commits March 7, 2018 10:50

Initial test integration

7a90146

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

d0f70b9

…INDY-992

Two more files done

9394543

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

new test

e11af80

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

4 more folders done

873bbb1

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

two more files

cff29c6

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

some changes

b070c36

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

693c9bb

…INDY-992

More tests integrated. Problems: validator functions of client in tes…

a0f7558

…t_state_proof; problem with wrong bls keys Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Initial commit

b924ff5

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Script fix. bls validation fix

72dc0ad

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

more changes

6cca8c5

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

3aafa9c

…INDY-1058

little fix

b2f6e48

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Fix for bls validation tests. Not done: update_incorrect test and sta…

1d96def

…te_proof test Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Only state_proof test left

2761e98

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Tests integration done

8cc56c6

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Deletion of Client1Connected. More test fix

509a919

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

8fc9d92

…INDY-1058

Import deletion. flake8 error fix.

c4dc583

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

b56f65e

…INDY-992

Merge branch 'indy-sdk-integration/INDY-992' into indy-sdk-integratio…

012a91b

…n/INDY-1058 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

More changes to txnPoolNodeSet

8cfe95c

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Changes in tests

c5285da

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Remove pf TestNodeSet. Change of helper methods. Part 1.

5ec36c5

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

a9f7104

…INDY-1058 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

c3059f0

…INDY-1058

Remove TestNodeSet from helper. part 2

e6cbc10

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

More tests integrated

5708f72

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Functions fixes.

5d76f77

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 4 commits April 4, 2018 09:20

fix

260116c

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

fix

4c15288

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

3ca367b

…INDY-1209-1

little addition

98002d7

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 10 commits April 9, 2018 19:19

some fixes

febb315

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Changes in helper functions

c858967

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

ebd4fcb

…INDY-1209-1

Some changes for node's tests

0610058

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

deletions of client

1b42e81

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

1ceab8d

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

fixes for test

58bc541

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

little fixes

29249a5

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

2fd0ac3

…INDY-1209-1

INDY-1209: fix test timeout

d10124f

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

dsurnin suggested changes Apr 18, 2018

View reviewed changes

ArtObr added 2 commits April 20, 2018 09:39

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

c5b7bcb

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

INDY-1209: Fix tests according to review

f8b9da8

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr added 2 commits April 24, 2018 10:43

INDY-1209: Add functionality for skipping verkey in request

6fc9a41

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

INDY-1209: Reset timeout back

c019e24

Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

dsurnin approved these changes Apr 24, 2018

View reviewed changes

ArtObr added 2 commits April 24, 2018 14:28

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

f9e2585

…INDY-1209-1

Merge remote-tracking branch 'base/master' into indy-sdk-integration/…

82bfd72

…INDY-1209-1 Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ashcherbakov approved these changes Apr 24, 2018

View reviewed changes

andkononykhin merged commit 9a2f362 into hyperledger:master Apr 25, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[1209-1] Remove old client's fucntions #600

[1209-1] Remove old client's fucntions #600

ArtObr commented Mar 29, 2018

ArtObr commented Apr 3, 2018

ArtObr commented Apr 3, 2018

ArtObr commented Apr 9, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018 •

edited

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

ArtObr Apr 24, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

dsurnin Apr 18, 2018

ArtObr commented Apr 23, 2018

		@@ -111,6 +111,7 @@ def testRequestFullRoundTrip(replied1, client1):


		# noinspection PyIncorrectDocstring
		@pytest.mark.skip(reason='sdk integration')

		@@ -127,6 +128,7 @@ def chk():


		# noinspection PyIncorrectDocstring
		@pytest.mark.skip(reason='sdk integration')

		@@ -10,6 +12,7 @@


		# noinspection PyIncorrectDocstring
		@pytest.mark.skip(reason='sdk integration')

		@@ -28,6 +28,7 @@ def nodeChangesRequest(txnPoolNodeSet):


		# noinspection PyIncorrectDocstring,PyUnusedLocal,PyShadowingNames
		@pytest.mark.skip(reason='sdk integration')

[1209-1] Remove old client's fucntions #600

[1209-1] Remove old client's fucntions #600

Conversation

ArtObr commented Mar 29, 2018

ArtObr commented Apr 3, 2018

ArtObr commented Apr 3, 2018

ArtObr commented Apr 9, 2018

Choose a reason for hiding this comment

ArtObr Apr 24, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArtObr commented Apr 23, 2018

ArtObr Apr 24, 2018 •

edited