[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions #579

ArtObr · 2018-03-21T07:32:48Z

No description provided.

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>

…INDY-1209

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

ArtObr · 2018-03-26T15:19:56Z

Test this please

ArtObr · 2018-03-26T15:20:32Z

Test this please

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

dsurnin · 2018-03-27T09:07:33Z

plenum/test/node_catchup/conftest.py

+        new_steward_name, new_node_name, tdir, tconf, nodeClass=testNodeClass,
+        allPluginsPath=allPluginsPath, autoStart=True,
+        do_post_node_creation=do_post_node_creation)
+    yield looper, new_node, sdk_pool_handle, new_steward_wallet_handle


pool refresh is not called here but pool handle is returned
it should be fixed

dsurnin · 2018-03-27T09:08:12Z

plenum/test/node_catchup/conftest.py

+        sdk_node_created_after_some_txns
+    txnPoolNodeSet.append(new_node)
+    looper.run(checkNodesConnected(txnPoolNodeSet))
+    return looper, new_node, sdk_pool_handle, new_steward_wallet_handle


pool refresh is not called here but pool handle is returned
it should be fixed

dsurnin · 2018-03-27T09:09:16Z

plenum/test/node_catchup/test_catchup_delayed_nodes.py

@@ -60,7 +75,8 @@ def testCatchupDelayedNodes(txnPoolNodeSet, nodeSetWithNodeAddedAfterSomeTxns,
    nodeX.stop()
    nodeY.stop()
    logger.debug("Sending requests")
-    sendReqsToNodesAndVerifySuffReplies(looper, wallet, client, 50)
+    sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle,


pool refresh is not called before pool handle usage

fix it here and in all "add node tests" below

dsurnin · 2018-03-27T09:11:31Z

plenum/test/node_catchup/test_catchup_inlcuding_3PC.py

@@ -43,7 +43,7 @@ def pre_check(tconf, looper, txnPoolNodeSet, tdirWithClientPoolTxns,
    looper.add(client)
    looper.run(client.ensureConnectedToNodes())
    for i in range(tconf.ProcessedBatchMapsToKeep - 1):
-        sendReqsToNodesAndVerifySuffReplies(looper, wallet, client, 1)
+         sendReqsToNodesAndVerifySuffReplies(looper, wallet, client, 1)


did you forget to change it?

…INDY-1209

…al, NodeSetWithNodeAddedAfterSomeTxns, nodeCreatedAfterSomeTxns, newNodeCaughtUp. Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr · 2018-03-27T16:51:28Z

Test this please

ArtObr · 2018-03-27T17:11:49Z

Test this please

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

dsurnin · 2018-03-28T09:42:10Z

plenum/test/node_catchup/test_catchup_demoted.py


    logger.info("3. send more requests, "
                "so that the new node's state is outdated")
-    sendReqsToNodesAndVerifySuffReplies(looper, wallet, client, 5)
-    checkNodeDataForInequality(newNode, *txnPoolNodeSet[:-1])
+    sdk_send_random_and_check(looper, txnPoolNodeSet, sdk_pool_handle,


there is no pool refresh after node update

add pool refresh to the end of sdk_send_update_node func, i.e. inside the func

dsurnin · 2018-03-28T09:49:38Z

plenum/test/node_catchup/test_catchup_while_new_request_incoming.py

-        tdir, tdirWithClientPoolTxns, tconf, nodeClass=testNodeClass,
+    new_steward_name = randomString()
+    new_node_name = "Epsilon"
+    new_steward_wallet_handle, new_node = sdk_add_new_steward_and_node(


add pool refresh after the call

dsurnin · 2018-03-28T10:07:01Z

plenum/test/node_request/test_quorum_f_plus_2_nodes_but_not_primary_off_and_on.py

 from plenum.test.pool_transactions.helper import \
    disconnect_node_and_ensure_disconnected
 from plenum.test.test_node import ensureElectionsDone, getRequiredInstances
 from plenum.test.view_change.helper import start_stopped_node

-TestRunningTimeLimitSec = 200
+TestRunningTimeLimitSec = 400


Add TODO with something like "restore back after sdk will have api call to change its timeout"

dsurnin · 2018-03-28T10:13:45Z

plenum/test/plugin/demo_plugin/test_plugin_request_handling.py

@@ -86,9 +92,10 @@ def test_plugin_dynamic_validation(txn_pool_node_set_post_creation, looper, stew
    successful_op(looper, op, sdk_wallet_steward, sdk_pool_handle)


+# TODO: probably delete


Why do you want to delete it?

It uses sdk requests sends and in the same time take value of defaultId from stewardWallet. So i thought that this is check related to the old client things. Also, it have only 2 usage as a fixture.

It would be better to rewrite it and remove the comment

dsurnin · 2018-03-28T10:14:44Z

plenum/test/pool_transactions/test_suspend_node.py

@@ -45,7 +44,7 @@ def testStewardSuspendsNode(looper, txnPoolNodeSet,
        looper.run(eventually(checkNodeNotInNodeReg, client, newNode.name))

    # Check a client can send request and receive replies
-    req = sendRandomRequest(newStewardWallet, newSteward)
+    # req = sendRandomRequest(newStewardWallet, newSteward)


why did comment this line?

Cause i think that this test will never be unskip (: (it was skipped 02.17)

dsurnin · 2018-03-28T11:09:21Z

plenum/test/test_dirty_read.py

@@ -1,58 +0,0 @@
-from plenum.common.types import f


Do not delete this test and file
Rewrite it

dsurnin · 2018-03-28T11:09:58Z

plenum/test/test_memory_consumpion.py

-                                            client,
-                                            numRequests,
-                                            fVal)
+        #  sendReqsToNodesAndVerifySuffReplies(txnPoolNodesLooper,


remove comments

dsurnin · 2018-03-28T11:20:25Z

plenum/test/view_change/test_6th_node_join_after_view_change_by_primary_restart.py

@@ -41,19 +40,14 @@ def catchuped(node):
    assert node.mode == Mode.participating


-def add_new_node(looper, nodes, steward, steward_wallet,
+def add_new_node(looper, nodes, sdk_pool_handle, sdk_wallet_steward,


Add pool refresh to this func

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

dsurnin · 2018-03-29T06:03:29Z

plenum/test/plugin/demo_plugin/test_plugin_request_handling.py

@@ -86,9 +92,10 @@ def test_plugin_dynamic_validation(txn_pool_node_set_post_creation, looper, stew
    successful_op(looper, op, sdk_wallet_steward, sdk_pool_handle)


+# TODO: probably delete


It would be better to rewrite it and remove the comment

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

…dy-plenum into indy-sdk-integration/INDY-1209

…per functions (hyperledger#579) * 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>

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 changed the title ~~[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions~~ [INDY-1209] Raise node_request and pool_transactions fixtures and helper functions [skip ci] Mar 26, 2018

ArtObr added 3 commits March 26, 2018 17:20

Deletion of sendRandomRequests. Part 3.

93fb144

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

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

d4df318

…INDY-1209

Little fix

4b649c1

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

ArtObr changed the title ~~[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions [skip ci]~~ [INDY-1209] Raise node_request and pool_transactions fixtures and helper functions Mar 26, 2018

Deletion of sendRandomRequest. Part 4.

7ea516b

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

ArtObr changed the title ~~[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions~~ [INDY-1209] Raise node_request and pool_transactions fixtures and helper functions [skip ci] Mar 26, 2018

dsurnin suggested changes Mar 27, 2018

View reviewed changes

ArtObr added 2 commits March 27, 2018 16:06

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

483751f

…INDY-1209

Deletion of sendRandomRequests. Part 5. Deleted: ensure_pool_function…

ff34a31

…al, NodeSetWithNodeAddedAfterSomeTxns, nodeCreatedAfterSomeTxns, newNodeCaughtUp. Signed-off-by: ArtObr <artemobruchnikov@gmail.com>

ArtObr changed the title ~~[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions [skip ci]~~ [INDY-1209] Raise node_request and pool_transactions fixtures and helper functions Mar 27, 2018

ArtObr added 3 commits March 28, 2018 08:06

little fix

dae8722

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

little fix

7adb439

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

little fix

4804c50

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

dsurnin suggested changes Mar 28, 2018

View reviewed changes

Review changes

0bc3e5e

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

dsurnin suggested changes Mar 29, 2018

View reviewed changes

ArtObr added 4 commits March 29, 2018 17:42

little fix for test passing

ec0912a

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

little fix for test passing

1f8bbe2

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

Review change

dfba309

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

Merge branch 'indy-sdk-integration/INDY-1209' of github.com:ArtObr/in…

f9d51dd

…dy-plenum into indy-sdk-integration/INDY-1209

dsurnin approved these changes Mar 29, 2018

View reviewed changes

ashcherbakov approved these changes Mar 29, 2018

View reviewed changes

ashcherbakov merged commit e91be80 into hyperledger:master Mar 29, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions #579

[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions #579

ArtObr commented Mar 21, 2018

ArtObr commented Mar 26, 2018

ArtObr commented Mar 26, 2018

dsurnin Mar 27, 2018

dsurnin Mar 27, 2018

dsurnin Mar 27, 2018

dsurnin Mar 27, 2018

ArtObr commented Mar 27, 2018

ArtObr commented Mar 27, 2018

dsurnin Mar 28, 2018

dsurnin Mar 28, 2018

dsurnin Mar 28, 2018

dsurnin Mar 28, 2018

ArtObr Mar 28, 2018

dsurnin Mar 29, 2018

dsurnin Mar 28, 2018

ArtObr Mar 28, 2018

dsurnin Mar 28, 2018

dsurnin Mar 28, 2018

dsurnin Mar 28, 2018

dsurnin Mar 29, 2018

		@@ -86,9 +92,10 @@ def test_plugin_dynamic_validation(txn_pool_node_set_post_creation, looper, stew
		successful_op(looper, op, sdk_wallet_steward, sdk_pool_handle)


		# TODO: probably delete

[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions #579

[INDY-1209] Raise node_request and pool_transactions fixtures and helper functions #579

Conversation

ArtObr commented Mar 21, 2018

ArtObr commented Mar 26, 2018

ArtObr commented Mar 26, 2018

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 Mar 27, 2018

ArtObr commented Mar 27, 2018

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