[INDY-1327] change key-value in ReqIdrToTxn #712

Toktar · 2018-05-29T08:35:35Z

Changes:

now ReqIdrToTxn store data in map digest -> ledge_idseq_no
added field digest to txn

Changes - now ReqIdrToTxn store data in map digest -> ledge_id<delimiter>seq_no Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

…nto task-1327-req-idr-to-txn-change

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>

[INDY-1327] add protocol version getting

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Changes: - fix test client_authn.py - fix test test_req_to_txn.py Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Toktar · 2018-05-31T07:58:15Z

test this please

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Toktar · 2018-05-31T11:15:44Z

test this please

Toktar · 2018-05-31T12:15:36Z

test this please

Toktar · 2018-05-31T13:17:28Z

test this please

Toktar · 2018-05-31T14:14:48Z

test this please

Toktar · 2018-05-31T15:16:20Z

test this please

Toktar · 2018-06-01T05:20:28Z

Test this please

…nto task-1327-req-idr-to-txn-change

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

ashcherbakov · 2018-06-04T10:25:41Z

plenum/persistence/req_id_to_txn.py

@@ -11,30 +11,36 @@ class ReqIdrToTxn:
    """

    def __init__(self, keyValueStorage: KeyValueStorage):
+        self.delimiter = "~"


It can be a static constant on class level

ashcherbakov · 2018-06-04T10:26:45Z

plenum/persistence/req_id_to_txn.py

+        parse_data = val.split(self.delimiter)
+        return str(parse_data[0]), str(parse_data[1])
+
+    def _create_value(self, ledge_id, seq_no):


typo: ledge_id

ashcherbakov · 2018-06-04T10:27:28Z

plenum/persistence/req_id_to_txn.py

+
+    def _parse_value(self, val: string):
+        parse_data = val.split(self.delimiter)
+        return str(parse_data[0]), str(parse_data[1])


So, we expected seqNo as int previously and not it's str. Does it break anything?

Changed it to return seqNo as int, but I don't sure that it's a good idea. In fact, we store in a seqNoDB string. And in the origin version of code we convert it to int after get() just in case.

ashcherbakov · 2018-06-04T10:29:15Z

plenum/persistence/req_id_to_txn.py

@@ -11,30 +11,36 @@ class ReqIdrToTxn:
    """

    def __init__(self, keyValueStorage: KeyValueStorage):


Do we have unit tests for ReqIdrToTxn?

We have only integration test in test_already_processed_requests(). Should to add unit tests too?

Yes, please

ashcherbakov · 2018-06-04T10:31:10Z

plenum/common/txn_util.py

@@ -120,6 +120,10 @@ def get_req_id(txn):
    return txn[TXN_PAYLOAD][TXN_PAYLOAD_METADATA].get(TXN_PAYLOAD_METADATA_REQ_ID, None)


+def get_digest(txn):


Please add test for get_digest to test_txn_general_access_utils

lampkin-diet · 2018-06-04T10:47:41Z

plenum/server/pool_manager.py

@@ -196,7 +196,7 @@ def executePoolTxnBatch(self, ppTime, reqs, stateRoot, txnRoot) -> List:
        :param reqs: request
        """
        committedTxns = self.reqHandler.commit(len(reqs), stateRoot, txnRoot, ppTime)
-        self.node.updateSeqNoMap(committedTxns)
+        self.node.updateSeqNoMap(committedTxns, DOMAIN_LEDGER_ID)


Do you mean POOL_LEDGER_ID?

Yes, thank you. I'm not sure, because this information is not correct to leave as a constant, but I didn't find another way.

lampkin-diet · 2018-06-04T10:51:55Z

plenum/test/transactions/test_req_to_txn.py

+            req.get(f.SIGS.nm, None),
+            req.get(f.PROTOCOL_VERSION.nm, None)
+        ).digest
+        sign = req.get("signature")


please replace "signature" with f.SIG.nm as you use before

Changes: - add test test_get_digest() - refactoring req_and_expected() - refactoring ReqIdrToTxn Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

ashcherbakov · 2018-06-04T11:19:46Z

plenum/common/txn_util.py

-    elif isinstance(req, str):
-        req_data = json.loads(req)
-    elif isinstance(req, Request):
+        req = Request(


It's better to use named arguments here

ashcherbakov · 2018-06-04T11:23:13Z

plenum/common/txn_util.py

@@ -246,7 +259,8 @@ def do_req_to_txn(req_data, req_op):

    append_payload_metadata(result,


Please add a test to test_txn_init_utils

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Toktar · 2018-06-04T14:14:06Z

test this please

Toktar · 2018-06-04T14:16:33Z

test this please

Toktar · 2018-06-04T15:22:42Z

test this please

Toktar and others added 16 commits May 28, 2018 11:13

INDY-1327: change key-value in ReqIdrToTxn

c7b917f

Changes - now ReqIdrToTxn store data in map digest -> ledge_id<delimiter>seq_no Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: change methods worked ReqIdrToTxn

6c0d82f

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: prepare to adding digest to txn

aa49c6d

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Merge branch 'master' of https://github.com/hyperledger/indy-plenum i…

fec9243

…nto task-1327-req-idr-to-txn-change

INDY-1327: add digest to txn

f1f3823

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix bug with strings concatenation

4667598

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix problem in Request as_dict()

3c18619

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix problem with getting value from ReqIdrToTxn

713319b

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

[INDY-1327] add protocol version getting

f612b70

Signed-off-by: Andrew Nikitin <andrew.nikitin@dsr-corporation.com>

Merge pull request #2 from anikitinDSR/public/indy-1327

efa1079

[INDY-1327] add protocol version getting

INDY-1327: code style

9f4c50f

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix decode problem in req_id_to_txn.py

c1e865e

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: change documentation

b128b36

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix tests

191f23d

Changes: - fix test client_authn.py - fix test test_req_to_txn.py Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix reqToTxn()

b157141

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix test test_req_to_txn.py

d21971b

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Toktar added 2 commits May 31, 2018 12:07

INDY-1327: add digest to all req_data in reqToTxn()

4181705

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix tests test_req_to_txn.py

3278e08

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

Toktar changed the title ~~[WIP][INDY-1327] change key-value in ReqIdrToTxn~~ [INDY-1327] change key-value in ReqIdrToTxn May 31, 2018

Toktar added 2 commits June 4, 2018 11:55

Merge branch 'master' of https://github.com/hyperledger/indy-plenum i…

b0cbffc

…nto task-1327-req-idr-to-txn-change

INDY-1370: remove excess method

9a794a3

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

ashcherbakov reviewed Jun 4, 2018

View reviewed changes

lampkin-diet reviewed Jun 4, 2018

View reviewed changes

Toktar added 2 commits June 4, 2018 13:59

INDY-1327: add test test_get_digest() and fix some typo names

7c024ca

Changes: - add test test_get_digest() - refactoring req_and_expected() - refactoring ReqIdrToTxn Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: fix updateSeqNoMap call in pool_manager.py

e5c2d3b

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

ashcherbakov reviewed Jun 4, 2018

View reviewed changes

Toktar added 2 commits June 4, 2018 14:28

INDY-1327: update test_append_payload_metadata()

2b09046

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

INDY-1327: added unit tests for req_idr_to_txn

626b938

Signed-off-by: toktar <renata.toktar@dsr-corporation.com>

ashcherbakov approved these changes Jun 4, 2018

View reviewed changes

lampkin-diet approved these changes Jun 5, 2018

View reviewed changes

ashcherbakov merged commit f4d1063 into hyperledger:master Jun 5, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[INDY-1327] change key-value in ReqIdrToTxn #712

[INDY-1327] change key-value in ReqIdrToTxn #712

Toktar commented May 29, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented Jun 1, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

lampkin-diet Jun 4, 2018

Toktar Jun 4, 2018 •

edited

Toktar Jun 4, 2018

lampkin-diet Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

ashcherbakov Jun 4, 2018

Toktar Jun 4, 2018

Toktar commented Jun 4, 2018

Toktar commented Jun 4, 2018

Toktar commented Jun 4, 2018

		@@ -11,30 +11,36 @@ class ReqIdrToTxn:
		"""

		def __init__(self, keyValueStorage: KeyValueStorage):

		@@ -120,6 +120,10 @@ def get_req_id(txn):
		return txn[TXN_PAYLOAD][TXN_PAYLOAD_METADATA].get(TXN_PAYLOAD_METADATA_REQ_ID, None)


		def get_digest(txn):

		@@ -246,7 +259,8 @@ def do_req_to_txn(req_data, req_op):

		append_payload_metadata(result,

[INDY-1327] change key-value in ReqIdrToTxn #712

[INDY-1327] change key-value in ReqIdrToTxn #712

Conversation

Toktar commented May 29, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented May 31, 2018

Toktar commented Jun 1, 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

Toktar Jun 4, 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

Toktar commented Jun 4, 2018

Toktar commented Jun 4, 2018

Toktar commented Jun 4, 2018

Toktar Jun 4, 2018 •

edited