Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged

Conversation

ArtObr
Copy link
Contributor

@ArtObr ArtObr commented Mar 29, 2018

Remove old client's fucntions and assosiated tests

ArtObr added 30 commits March 7, 2018 10:50
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
…t_state_proof; problem with wrong bls keys

Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
Signed-off-by: ArtObr <[email protected]>
@ArtObr
Copy link
Contributor Author

ArtObr commented Apr 3, 2018

Test this please

1 similar comment
@ArtObr
Copy link
Contributor Author

ArtObr commented Apr 3, 2018

Test this please

@ArtObr
Copy link
Contributor Author

ArtObr commented Apr 9, 2018

Test this please

"""
Client should be not be blacklisted by node on sending an unsigned request
"""

client_name = poolTxnClientNames[0]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

@ArtObr ArtObr Apr 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test rewritten

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):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed.

sdk_ensure_pool_functional(looper, txnPoolNodeSet,
sdk_wallet_steward, sdk_pool_handle)
else:
sdk_add_new_nym(looper, sdk_pool_handle, sdk_wallet_steward,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed this way.

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it could be deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test should be discussed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rewritten

import pytest


@pytest.mark.skip(reason='sdk integration')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it could be deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted

@@ -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')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is it skipped?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rewritten

@@ -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))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be discussed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be deleted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be discussed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rewritten

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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



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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be deleted

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be deleted

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


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@ArtObr
Copy link
Contributor Author

ArtObr commented Apr 23, 2018

Test this please

@andkononykhin andkononykhin merged commit 9a2f362 into hyperledger:master Apr 25, 2018
lovesh pushed a commit to evernym/indy-plenum that referenced this pull request May 3, 2018
* Initial test integration

Signed-off-by: ArtObr <[email protected]>

* Two more files done

Signed-off-by: ArtObr <[email protected]>

* new test

Signed-off-by: ArtObr <[email protected]>

* 4 more folders done

Signed-off-by: ArtObr <[email protected]>

* two more files

Signed-off-by: ArtObr <[email protected]>

* some changes

Signed-off-by: ArtObr <[email protected]>

* More tests integrated. Problems: validator functions of client in test_state_proof; problem with wrong bls keys

Signed-off-by: ArtObr <[email protected]>

* Initial commit

Signed-off-by: ArtObr <[email protected]>

* Script fix. bls validation fix

Signed-off-by: ArtObr <[email protected]>

* more changes

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* Fix for bls validation tests. Not done: update_incorrect test and state_proof test

Signed-off-by: ArtObr <[email protected]>

* Only state_proof test left

Signed-off-by: ArtObr <[email protected]>

* Tests integration done

Signed-off-by: ArtObr <[email protected]>

* Deletion of Client1Connected. More test fix

Signed-off-by: ArtObr <[email protected]>

* Import deletion. flake8 error fix.

Signed-off-by: ArtObr <[email protected]>

* More changes to txnPoolNodeSet

Signed-off-by: ArtObr <[email protected]>

* Changes in tests

Signed-off-by: ArtObr <[email protected]>

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

Signed-off-by: ArtObr <[email protected]>

* Remove TestNodeSet from helper. part 2

Signed-off-by: ArtObr <[email protected]>

* More tests integrated

Signed-off-by: ArtObr <[email protected]>

* Functions fixes.

Signed-off-by: ArtObr <[email protected]>

* Fix for genesis txns

Signed-off-by: ArtObr <[email protected]>

* More tests integrated

Signed-off-by: ArtObr <[email protected]>

* primary_selection dependency fix

Signed-off-by: ArtObr <[email protected]>

* Fixture fix for view_change

Signed-off-by: ArtObr <[email protected]>

* View change test fix

Signed-off-by: ArtObr <[email protected]>

* Skips for merkle proof tests

Signed-off-by: ArtObr <[email protected]>

* Skips for merkle proof tests

Signed-off-by: ArtObr <[email protected]>

* Remove sendRandomRequest of old client. Part 1.

Signed-off-by: ArtObr <[email protected]>

* Review changes

Signed-off-by: ArtObr <[email protected]>

* Review changes

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequest. Part 2.

Signed-off-by: ArtObr <[email protected]>

* Little error fix

Signed-off-by: ArtObr <[email protected]>

* waitReqNackFromPoolWithReason function deletion

Signed-off-by: ArtObr <[email protected]>

* waitRejectFromPoolWithReason function deletion

Signed-off-by: ArtObr <[email protected]>

* checkReqNack function deletion

Signed-off-by: ArtObr <[email protected]>

* Two more fucntions deletion

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequests. Part 1.

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequests. Part 2. send_reqs_to_nodes_and_verify_all_replies deleted.

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequests. Part 3.

Signed-off-by: ArtObr <[email protected]>

* Little fix

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequest. Part 4.

Signed-off-by: ArtObr <[email protected]>

* Deletion of sendRandomRequests. Part 5. Deleted: ensure_pool_functional, NodeSetWithNodeAddedAfterSomeTxns, nodeCreatedAfterSomeTxns, newNodeCaughtUp.

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* Review changes

Signed-off-by: ArtObr <[email protected]>

* little fix for test passing

Signed-off-by: ArtObr <[email protected]>

* little fix for test passing

Signed-off-by: ArtObr <[email protected]>

* Review change

Signed-off-by: ArtObr <[email protected]>

* deletion of send_signed_request

Signed-off-by: ArtObr <[email protected]>

* Deletion of send_signed_request

Signed-off-by: ArtObr <[email protected]>

* deletion of waitForSufficientReplies. Part 1.

Signed-off-by: ArtObr <[email protected]>

* little fixes

Signed-off-by: ArtObr <[email protected]>

* more tests

Signed-off-by: ArtObr <[email protected]>

* more fixes

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* little fix

Signed-off-by: ArtObr <[email protected]>

* more changes

Signed-off-by: ArtObr <[email protected]>

* fix

Signed-off-by: ArtObr <[email protected]>

* fix

Signed-off-by: ArtObr <[email protected]>

* little addition

Signed-off-by: ArtObr <[email protected]>

* some fixes

Signed-off-by: ArtObr <[email protected]>

* Changes in helper functions

Signed-off-by: ArtObr <[email protected]>

* Some changes for node's tests

Signed-off-by: ArtObr <[email protected]>

* deletions of client

Signed-off-by: ArtObr <[email protected]>

* fixes for test

Signed-off-by: ArtObr <[email protected]>

* little fixes

Signed-off-by: ArtObr <[email protected]>

* INDY-1209: fix test timeout

Signed-off-by: ArtObr <[email protected]>

* INDY-1209: Fix tests according to review

Signed-off-by: ArtObr <[email protected]>

* INDY-1209: Add functionality for skipping verkey in request

Signed-off-by: ArtObr <[email protected]>

* INDY-1209: Reset timeout back

Signed-off-by: ArtObr <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants