refactor(DataIntegrityProof): extract merkle proof 2019 to its own co…

…nstructor

cert_issuer/merkle_tree_generator.py

@@ -7,6 +7,7 @@
 from pycoin.serialize import h2b
 from lds_merkle_proof_2019.merkle_proof_2019 import MerkleProof2019
 from cert_issuer import helpers
+from cert_issuer.proof_suites.merkle_proof_2019 import MerkleProof2019Suite
 
 
 def hash_byte_array(data):
@@ -75,14 +76,8 @@ def get_proof_generator(self, tx_id, verification_method, chain=Chain.bitcoin_ma
             logging.info('merkle_json: %s', str(merkle_json))
 
             proof_value = mp2019.encode(merkle_json)
-            merkle_proof = {
-                "type": "MerkleProof2019",
-                "created": datetime.now().isoformat(),
-                "proofValue": proof_value.decode('utf8'),
-                "proofPurpose": "assertionMethod",
-                "verificationMethod": verification_method
-            }
-            yield merkle_proof
+            merkle_proof = MerkleProof2019Suite(proof_value, verification_method)
+            yield merkle_proof.to_json_object()
 
 
 def to_source_id(txid, chain):

cert_issuer/proof_handler.py

@@ -1,4 +1,4 @@
-from cert_issuer.chained_proof_2021 import ChainedProof2021
+from cert_issuer.proof_suites.chained_proof_2021 import ChainedProof2021
 from cert_schema import ContextUrls
 from cert_issuer.utils import array_intersect
 

cert_issuer/proof_suites/merkle_proof_2019.py

@@ -0,0 +1,23 @@
+from datetime import datetime
+
+MERKLE_PROOF_2019_TYPE = 'MerkleProof2019'
+class MerkleProof2019Suite:
+    type = ''
+    verificationMethod = ''
+    created = ''
+    proofPurpose = ''
+    previousProof = ''
+    proofValue = ''
+
+    def __init__(self, proof_value, verificationMethod):
+        self.type = MERKLE_PROOF_2019_TYPE
+        self.proofPurpose = 'assertionMethod'
+        self.created = self.get_creation_time()
+        self.proofValue = proof_value.decode('utf-8')
+        self.verificationMethod = verificationMethod
+
+    def get_creation_time(self):
+        return datetime.now().isoformat()
+
+    def to_json_object(self):
+        return self.__dict__