[INDY-1171] Integrate pool_transactions tests with libindy #541

ArtObr · 2018-02-20T16:39:03Z

No description provided.

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

…INDY-1019

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

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

…INDY-1019

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

…INDY-1019

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

…INDY-1019

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

…on/INDY-1172 Signed-off-by: ArtObr <[email protected]>

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

…INDY-1172

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

…INDY-1172

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

…INDY-1019

…on/INDY-1019

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

…on/INDY-1171

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

…INDY-1171

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

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

…INDY-1171

dsurnin · 2018-02-27T04:14:15Z

plenum/test/pool_transactions/helper.py

+    if (sigseed is None and destination is None):
+        raise AttributeError('You must specify destination directly or using sigseed')
+    if (sigseed is not None and destination is not None):
+        raise AttributeError('You must use only one of: sigseed or destination')


These two conditions are simply XOR operation and it would be easier to read and understand one operation.
Rewrite it to something like this
none_sigseed = segseed is None
none_dest = dest is None
if none_sigseed == none_dest : error you should provide only one of ...

dsurnin · 2018-02-27T04:17:09Z

plenum/test/pool_transactions/helper.py

+    if nodeIp is not None: data['node_ip'] = nodeIp
+    if nodePort is not None: data['node_port'] = nodePort
+    if bls_key is not None: data['blskey'] = bls_key
+    data['services'] = ["VALIDATOR"]


there are some tests require to demote node - i.e. set 'services' to empty array [ ], so you can extend this func for such a case

dsurnin · 2018-02-27T04:22:09Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+    # setting incorrect Ledger_ID
+    request_json = json.loads(request)
+    request_json['operation']['ledgerId'] = 5908


Create a const INVALID_LEDGER_ID = 5908 and use it instead of raw 5908 in code

dsurnin · 2018-02-27T04:22:45Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+    # setting incorrect data
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, -23))


same here - use named const

dsurnin · 2018-02-27T04:26:19Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+        # Check with and without ledger id
+        request_json = json.loads(request)
+        if i: request_json['operation']['ledgerId'] = 1


don't write it in one line

dsurnin · 2018-02-27T04:27:14Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+    # setting incorrect data
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, randint(100, 1000)))


create func - generate_invalid_smthg:
return randint...

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

…INDY-1171

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

dsurnin · 2018-03-06T06:38:19Z

plenum/test/pool_transactions/test_get_txn_request.py

+                                       sdk_pool_handle):
+    _, steward_did = sdk_wallet_steward
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, 1))


I would prefer not to use raw sdk functions - create wrapper in conftest/helper, add test to sdk_tests

dsurnin · 2018-03-06T06:38:57Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+    # setting incorrect data
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, INVALID_SEQ_NO))


dsurnin · 2018-03-06T06:39:13Z

plenum/test/pool_transactions/test_get_txn_request.py

+    _, steward_did = sdk_wallet_steward
+    for i in range(2):
+        request = looper.loop.run_until_complete(
+            build_get_txn_request(steward_did, 1))


dsurnin · 2018-03-06T06:41:01Z

plenum/test/pool_transactions/test_get_txn_request.py

+        return randint(500, 1000)
+
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, generate_non_existing_seq_no()))


the same - wrapper is needed

dsurnin · 2018-03-06T06:42:14Z

plenum/test/pool_transactions/test_get_txn_request.py

+
+    _, steward_did = sdk_wallet_steward
+    request = looper.loop.run_until_complete(
+        build_get_txn_request(steward_did, seqNo))


dsurnin · 2018-03-06T06:50:52Z

plenum/common/exceptions.py

@@ -280,3 +280,11 @@ def __init__(self, expLen, actLen, *args, **kwargs):
        ex_txt = 'Message len {} exceeded allowed limit of {}'.format(
            actLen, expLen)
        super().__init__(ex_txt, *args, **kwargs)
+
+
+class ReqNackError(Exception):


extend name to RequestNackedException

dsurnin · 2018-03-06T06:51:34Z

plenum/common/exceptions.py

+    pass
+
+
+class RejectError(Exception):


extend name to RequestRejectedException

dsurnin · 2018-03-06T06:55:55Z

plenum/test/helper.py

@@ -1060,10 +1061,10 @@ def sdk_check_reply(req_res):
        raise AssertionError("Got an error with code {} for request {}"


Parse sdk error code and create specific type for important runtime errors

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

ArtObr · 2018-03-06T08:14:55Z

test this please

…er#541) * Additional checks for sdk_ functions Signed-off-by: ArtObr <[email protected]> * Fix for exception handling and new function for "json to object" converting Signed-off-by: ArtObr <[email protected]> * Space and the end Signed-off-by: ArtObr <[email protected]> * Most of test integrated with txnPoolNodeSet Signed-off-by: ArtObr <[email protected]> * 3 test left to do Signed-off-by: ArtObr <[email protected]> * two tests left in INDY-1019. Others integrated Signed-off-by: ArtObr <[email protected]> * Little fixes Signed-off-by: ArtObr <[email protected]> * Import resolve, TODO added Signed-off-by: ArtObr <[email protected]> * New line at the end Signed-off-by: ArtObr <[email protected]> * TODO for import added Signed-off-by: ArtObr <[email protected]> * Unused looper import removed Signed-off-by: ArtObr <[email protected]> * One more test integrated with sdk Signed-off-by: ArtObr <[email protected]> * Fixtures for prev test Signed-off-by: ArtObr <[email protected]> * Unused import removed Signed-off-by: ArtObr <[email protected]> * Start of integration Signed-off-by: ArtObr <[email protected]> * Changes for test_different_request integration with sdk Signed-off-by: ArtObr <[email protected]> * helper changes commited Signed-off-by: ArtObr <[email protected]> * INDY-1172 done with chages at pool_transactions Signed-off-by: ArtObr <[email protected]> * little fix Signed-off-by: ArtObr <[email protected]> * Code structure changes Signed-off-by: ArtObr <[email protected]> * Additinal code structure changes Signed-off-by: ArtObr <[email protected]> * Started sdk integration of tests Signed-off-by: ArtObr <[email protected]> * Review fixes Signed-off-by: ArtObr <[email protected]> * LibIndy versions update Signed-off-by: ArtObr <[email protected]> * temp Signed-off-by: ArtObr <[email protected]> * ha persist test done Signed-off-by: ArtObr <[email protected]> * more tests done Signed-off-by: ArtObr <[email protected]> * review fixes Signed-off-by: ArtObr <[email protected]> * More tests done, some problems Signed-off-by: ArtObr <[email protected]> * more tests done Signed-off-by: ArtObr <[email protected]> * temp Signed-off-by: ArtObr <[email protected]> * more tests Signed-off-by: ArtObr <[email protected]> * all tests done, except one. need more of exception handling Signed-off-by: ArtObr <[email protected]> * exception handling made. One test strange behaviour left Signed-off-by: ArtObr <[email protected]> * Exception handling additional fixes Signed-off-by: ArtObr <[email protected]> * Exception handling fixes. wrapper for builder Signed-off-by: ArtObr <[email protected]> * little tests fix Signed-off-by: ArtObr <[email protected]>

ArtObr added 30 commits February 7, 2018 12:28

Additional checks for sdk_ functions

b7bf039

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

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

7964748

…INDY-1019

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

e353bdc

…INDY-1019

Fix for exception handling and new function for "json to object" conv…

bac783f

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

Space and the end

9194251

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

Most of test integrated with txnPoolNodeSet

8e76fe3

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

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

5213476

…INDY-1019

3 test left to do

94ad1a2

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

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

2c5db03

…INDY-1019

two tests left in INDY-1019. Others integrated

1b897bf

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

Little fixes

995fd31

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

Import resolve, TODO added

b7bf226

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

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

1fc7959

…INDY-1019

New line at the end

c72f389

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

TODO for import added

4b1e35e

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

Unused looper import removed

3a622e9

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

One more test integrated with sdk

54a0f92

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

Fixtures for prev test

b77853a

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

Unused import removed

edea820

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

Start of integration

e69045d

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

Merge branch 'indy-sdk-integration/INDY-1019' into indy-sdk-integrati…

c7434a6

…on/INDY-1172 Signed-off-by: ArtObr <[email protected]>

Changes for test_different_request integration with sdk

4a316a1

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

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

c521a5f

…INDY-1172

helper changes commited

c966fbb

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

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

1f33869

…INDY-1172

INDY-1172 done with chages at pool_transactions

dec5565

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

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

5e7e340

…INDY-1019

Merge branch 'indy-sdk-integration/INDY-1172' into indy-sdk-integrati…

29fe6ff

…on/INDY-1019

little fix

98475ad

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

Code structure changes

4c9077b

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

ArtObr added 9 commits February 22, 2018 16:22

Review fixes

b5f52a4

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

LibIndy versions update

e883b70

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

Merge branch 'indy-sdk-integration/INDY-1019' into indy-sdk-integrati…

f36dce1

…on/INDY-1171

temp

080dc2c

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

ha persist test done

0ec2dc6

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

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

58b6c17

…INDY-1171

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

072bcbb

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

more tests done

02b1587

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

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

ce9f2f7

…INDY-1171

dsurnin suggested changes Feb 27, 2018

View reviewed changes

ArtObr added 9 commits February 27, 2018 13:49

review fixes

313ce5c

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

More tests done, some problems

26e182c

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

more tests done

c2fffbd

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

temp

e9ac26e

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

more tests

2ed932e

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

all tests done, except one. need more of exception handling

1571734

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

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

2cb174d

…INDY-1171

exception handling made. One test strange behaviour left

17f4535

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

Exception handling additional fixes

dfee2a2

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

dsurnin suggested changes Mar 6, 2018

View reviewed changes

ArtObr added 2 commits March 6, 2018 10:18

Exception handling fixes. wrapper for builder

c75f6ae

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

little tests fix

0591340

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

ArtObr changed the title ~~[INDY-1171] Integrate pool_transactions tests with libindy [skip ci]~~ [INDY-1171] Integrate pool_transactions tests with libindy Mar 6, 2018

dsurnin approved these changes Mar 6, 2018

View reviewed changes

ashcherbakov approved these changes Mar 6, 2018

View reviewed changes

ashcherbakov merged commit 8a7df59 into hyperledger:master Mar 6, 2018

ArtObr deleted the indy-sdk-integration/INDY-1171 branch March 13, 2018 08:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[INDY-1171] Integrate pool_transactions tests with libindy #541

[INDY-1171] Integrate pool_transactions tests with libindy #541

ArtObr commented Feb 20, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Feb 27, 2018

ArtObr Feb 27, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

dsurnin Mar 6, 2018

ArtObr Mar 6, 2018

ArtObr commented Mar 6, 2018

		@@ -1060,10 +1061,10 @@ def sdk_check_reply(req_res):
		raise AssertionError("Got an error with code {} for request {}"

[INDY-1171] Integrate pool_transactions tests with libindy #541

[INDY-1171] Integrate pool_transactions tests with libindy #541

Conversation

ArtObr commented Feb 20, 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

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