Merge pull request #19 from oceanprotocol/defect/revert-template-changes

defect/revert-template-changes

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.6
+current_version = 0.3.7
 commit = True
 tag = True
 

ocean_utils/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.6'
+__version__ = '0.3.7'
 
 #  Copyright 2018 Ocean Protocol Foundation
 #  SPDX-License-Identifier: Apache-2.0

ocean_utils/agreements/service_agreement.py

@@ -56,7 +56,7 @@ def from_json(cls, service_dict):
             service_dict.pop('templateId'),
             _attributes['main']['name'],
             _attributes['main']['creator'],
-            service_dict[cls.AGREEMENT_TEMPLATE]
+            _attributes[cls.AGREEMENT_TEMPLATE]
         )
 
         return cls(
@@ -86,7 +86,8 @@ def from_ddo(cls, service_type, ddo):
     def as_dictionary(self):
         values = Service.as_dictionary(self)
         values[ServiceAgreementTemplate.TEMPLATE_ID_KEY] = self.template_id
-        values[ServiceAgreement.AGREEMENT_TEMPLATE] = self.service_agreement_template.template
+        attributes = values[ServiceAgreement.SERVICE_ATTRIBUTES]
+        attributes[ServiceAgreement.AGREEMENT_TEMPLATE] = self.service_agreement_template.template
         return values
 
     def init_conditions_values(self, did, contract_name_to_address):

setup.py

@@ -85,6 +85,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/oceanprotocol/common-utils-py',
-    version='0.3.6',
+    version='0.3.7',
     zip_safe=False,
 )

tests/resources/ddo/ddo_sa_sample.json

@@ -149,9 +149,8 @@
         },
         "additionalInformation": {
           "description": ""
-        }
-      },
-      "serviceAgreementTemplate": {
+        },
+        "serviceAgreementTemplate": {
           "contractName": "EscrowAccessSecretStoreTemplate",
           "events": [
             {
@@ -294,6 +293,7 @@
             }
           ]
         }
+      }
     }
   ]
 }

tests/resources/ddo/ddo_sample1.json

@@ -133,9 +133,8 @@
         },
         "additionalInformation": {
           "description": ""
-        }
-      },
-      "serviceAgreementTemplate": {
+        },
+        "serviceAgreementTemplate": {
           "contractName": "EscrowAccessSecretStoreTemplate",
           "events": [
             {
@@ -278,6 +277,8 @@
             }
           ]
         }
+      }
+
     }
   ]
 }

tests/resources/ddo/ddo_sample2.json

@@ -135,9 +135,8 @@
         },
         "additionalInformation": {
           "description": ""
-        }
-      },
-      "serviceAgreementTemplate": {
+        },
+        "serviceAgreementTemplate": {
           "contractName": "EscrowAccessSecretStoreTemplate",
           "events": [
             {
@@ -280,6 +279,8 @@
             }
           ]
         }
+      }
+
     }
   ]
 }