Changes as per comments

sandeepnRES · sandeepnRES · commit c857604aa742 · 2021-11-15T14:44:30.000+05:30
Signed-off-by: sandeep.nishad1 &lt;sandeep.nishad1@ibm.com&gt;
diff --git a/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go b/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go
@@ -112,7 +112,7 @@ func (s *SmartContract) HandleExternalRequest(ctx contractapi.TransactionContext
 		resp := ""
 		if viewAddress.CCFunc == "GetHTLCHash" {
 			if len(viewAddress.Args) > 2 {
-				errorMessage := fmt.Sprintf("Recieved more arguments than required 1 argument.")
+				errorMessage := fmt.Sprintf("Recieved more arguments than required 2 argument.")
 				log.Error(errorMessage)
 				return "", errors.New(errorMessage)
 			}
@@ -124,22 +124,22 @@ func (s *SmartContract) HandleExternalRequest(ctx contractapi.TransactionContext
 				return "", errors.New(errorMessage)
 			}
 			resp, err = s.GetHTLCHashByContractId(ctx, viewAddress.Args[0])
-		} else if viewAddress.CCFunc == "GetHTLCHashPreImageByContractId" {
-			if len(viewAddress.Args) > 1 {
-				errorMessage := fmt.Sprintf("Recieved more arguments than required 1 argument.")
+		} else if viewAddress.CCFunc == "GetHTLCHashPreImage" {
+			if len(viewAddress.Args) > 2 {
+				errorMessage := fmt.Sprintf("Recieved more arguments than required 2 argument.")
 				log.Error(errorMessage)
 				return "", errors.New(errorMessage)
 			}
-			resp, err = s.GetHTLCHashPreImageByContractId(ctx, viewAddress.Args[0])
-		} else if viewAddress.CCFunc == "GetHTLCHashPreImage" {
-			if len(viewAddress.Args) > 2 {
+			resp, err = s.GetHTLCHashPreImage(ctx, viewAddress.Args[0], viewAddress.Args[1])
+		} else if viewAddress.CCFunc == "GetHTLCHashPreImageByContractId" {
+			if len(viewAddress.Args) > 1 {
 				errorMessage := fmt.Sprintf("Recieved more arguments than required 1 argument.")
 				log.Error(errorMessage)
 				return "", errors.New(errorMessage)
 			}
-			resp, err = s.GetHTLCHashPreImage(ctx, viewAddress.Args[0], viewAddress.Args[1])
+			resp, err = s.GetHTLCHashPreImageByContractId(ctx, viewAddress.Args[0])
 		} else {
-			errorMessage := fmt.Sprintf("Given function can not be invoked in Interop Chaincode.")
+			errorMessage := fmt.Sprintf("Given function %s can not be invoked in Interop Chaincode.", viewAddress.CCFunc)
 			err = errors.New(errorMessage)
 		}
 		if err != nil {
diff --git a/core/network/fabric-interop-cc/contracts/interop/manage_assets.go b/core/network/fabric-interop-cc/contracts/interop/manage_assets.go
@@ -310,11 +310,11 @@ func (s *SmartContract) GetHTLCHash(ctx contractapi.TransactionContextInterface,
 func (s *SmartContract) GetHTLCHashByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {
 	return assetexchange.GetHTLCHashByContractId(ctx, contractId)
 }
-func (s *SmartContract) GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {
-	return assetexchange.GetHTLCHashPreImageByContractId(ctx, contractId)
-}
 func (s *SmartContract) GetHTLCHashPreImage(ctx contractapi.TransactionContextInterface, callerChaincodeID, assetAgreementBytesBase64 string) (string, error) {
 	return assetexchange.GetHTLCHashPreImage(ctx, callerChaincodeID, assetAgreementBytesBase64)
 }
+func (s *SmartContract) GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {
+	return assetexchange.GetHTLCHashPreImageByContractId(ctx, contractId)
+}
 
 
diff --git a/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go b/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go
@@ -954,10 +954,6 @@ func GetHTLCHashByContractId(ctx contractapi.TransactionContextInterface, contra
 	return getHTLCHashHelper(ctx, assetLockVal.LockInfo)
 }
 
-func GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {
-	return getHashPreImageHelper(ctx, generateClaimContractIdMapKey(contractId))
-}
-
 func GetHTLCHashPreImage(ctx contractapi.TransactionContextInterface, callerChaincodeID, assetAgreementBytesBase64 string) (string, error) {
 	assetAgreementBytes, err := base64.StdEncoding.DecodeString(assetAgreementBytesBase64)
 	if err != nil {
@@ -980,6 +976,10 @@ func GetHTLCHashPreImage(ctx contractapi.TransactionContextInterface, callerChai
 	return getHashPreImageHelper(ctx, claimAssetLockKey)
 }
 
+func GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {
+	return getHashPreImageHelper(ctx, generateClaimContractIdMapKey(contractId))
+}
+
 func getHTLCHashHelper(ctx contractapi.TransactionContextInterface, lockInfo interface{}) (string, error) {
 	lockInfoVal := HashLock{}
 	lockInfoBytes, err := json.Marshal(lockInfo)
diff --git a/docs/README.md b/docs/README.md
@@ -11,6 +11,8 @@ To get started with capturing and publishing documentation see instructions belo
 
 This documentation site is built using [Docusaurus v2](https://v2.docusaurus.io/docs/).
 
+**NOTE:** Required Node.js version >= 12.13.0 or above.
+
 ## Preview Locally
 
 To edit and preview locally run a development server:
diff --git a/docs/docs/external/getting-started/enabling-weaver-network/corda.md b/docs/docs/external/getting-started/enabling-weaver-network/corda.md
@@ -384,7 +384,7 @@ val response = InteroperableHelper.interopFlow(
     'trade-finance-network',              // Local network name (destination)
     true,                                 // Boolean indication TLS is enabled.
     <relayTlsTrustStorePath>              // JKS file path containing relay server TLS CA certificates
-    <relayTlsTrustStorePassword>          // password used to create the JKS file
+    <relayTlsTrustStorePassword>,         // password used to create the JKS file
 )
 ```
 OR
@@ -395,7 +395,7 @@ val response = InteroperableHelper.interopFlow(
     <trade-finance-relay-url>[:<port>],   // Replace with local network's relay address and port
     'trade-finance-network',              // Local network name (destination)
     true,                                 // Boolean indication TLS is enabled.
-    <tlsCACertPathsForRelay>              // colon-separated list of CA certificate file paths
+    <tlsCACertPathsForRelay>,             // colon-separated list of CA certificate file paths
 )
 ```
 -->
diff --git a/samples/fabric/fabric-cli/src/data/interop/simpleasset/accessControlTemplate_ca.json b/samples/fabric/fabric-cli/src/data/interop/simpleasset/accessControlTemplate_ca.json
@@ -16,13 +16,13 @@
     {
       "principal": "<mspid>",
       "principalType": "ca",
-      "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
+      "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",
       "read": true
     },
     {
       "principal": "<mspid>",
       "principalType": "ca",
-      "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",
+      "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
       "read": true
     }
   ]
diff --git a/samples/fabric/fabric-cli/src/data/interop/simpleasset/accessControlTemplate_certificate.json b/samples/fabric/fabric-cli/src/data/interop/simpleasset/accessControlTemplate_certificate.json
@@ -16,13 +16,13 @@
     {
       "principal": "<certificate>",
       "principalType": "certificate",
-      "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
+      "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",
       "read": true
     },
     {
       "principal": "<certificate>",
       "principalType": "certificate",
-      "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",
+      "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
       "read": true
     }
   ]
diff --git a/samples/fabric/fabric-cli/src/data/interop/simpleasset/verificationPolicyTemplate.json b/samples/fabric/fabric-cli/src/data/interop/simpleasset/verificationPolicyTemplate.json
@@ -16,14 +16,14 @@
         }
       },
       {
-        "pattern": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
+        "pattern": "mychannel:simpleasset:GetHTLCHashPreImage:*",
         "policy": {
           "type": "Signature",
           "criteria": []
         }
       },
       {
-        "pattern": "mychannel:simpleasset:GetHTLCHashPreImage:*",
+        "pattern": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",
         "policy": {
           "type": "Signature",
           "criteria": []
diff --git a/tests/network-setups/corda/README.md b/tests/network-setups/corda/README.md
@@ -45,12 +45,12 @@ local file system or from Github Packages.
 For local versions, the `get-cordapps` script assumes that _a)_ the repositories
 for these are at the same directory level as the `networks-setup` repository,
 and _b)_ that the cordapp executables have been built in those repos. The
-required CorDapps are in
-[corda-interop-app](../../../core/network/corda-interop-app) and
-[corda-simple-application](../../../samples/corda/corda-simple-application) and
-[fungible-house-token](../../../samples/corda/fungible-house-token)
-and the instructions for building these projects can be found in their
-respective repos.
+required CorDapps are in:
+* [corda-interop-app](../../../core/network/corda-interop-app)
+* [corda-simple-application](../../../samples/corda/corda-simple-application)
+* [fungible-house-token](../../../samples/corda/fungible-house-token)
+
+The instructions for building these projects can be found in their respective folders.
 
 To get the CorDapps from Github Packages you will need to have permission to do so:
 
diff --git a/tests/network-setups/corda/scripts/get-cordapps.sh b/tests/network-setups/corda/scripts/get-cordapps.sh
@@ -62,9 +62,9 @@ elif [ "house" = "$app" ]; then
 
   ### Token SDK ###
 
-  wget https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/ci/ci-workflows/1.0/ci-workflows-1.0.jar -P $directory/../shared/artifacts
-  wget https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$tokenVersion/tokens-contracts-$tokenVersion.jar -P $directory/../shared/artifacts
-  wget https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$tokenVersion/tokens-workflows-$tokenVersion.jar -P $directory/../shared/artifacts
+  (cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/ci/ci-workflows/1.0/ci-workflows-1.0.jar) || exit 1
+  (cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-contracts/$tokenVersion/tokens-contracts-$tokenVersion.jar) || exit 1
+  (cd $directory/../shared/artifacts && curl -O https://software.r3.com/artifactory/corda-lib/com/r3/corda/lib/tokens/tokens-workflows/$tokenVersion/tokens-workflows-$tokenVersion.jar) || exit 1
 
 else
   echo "Cordapp not found" && exit 1
diff --git a/tests/network-setups/corda/scripts/start-nodes.sh b/tests/network-setups/corda/scripts/start-nodes.sh
@@ -6,7 +6,7 @@ profile=${2:-"1-node"}
 nw=${3:-Corda_Network}
 
 simpleAppVersion="0.4"
-houseTokenAppversion="1.0"
+houseTokenAppVersion="1.0"
 tokenVersion="1.2"
 
 weaverVersion="1.2.4-alpha.6"
@@ -20,8 +20,8 @@ for party in ${parties}; do
     cp $directory/../shared/artifacts/contracts-kotlin-$simpleAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
     cp $directory/../shared/artifacts/workflows-kotlin-$simpleAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
   elif [ "house" = "$app" ]; then
-    cp $directory/../shared/artifacts/contracts-$houseTokenAppversion.jar dev/${nw}/build/nodes/${party}/cordapps
-    cp $directory/../shared/artifacts/workflows-$houseTokenAppversion.jar dev/${nw}/build/nodes/${party}/cordapps
+    cp $directory/../shared/artifacts/contracts-$houseTokenAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
+    cp $directory/../shared/artifacts/workflows-$houseTokenAppVersion.jar dev/${nw}/build/nodes/${party}/cordapps
     
     cp $directory/../shared/artifacts/tokens-contracts-$tokenVersion.jar dev/${nw}/build/nodes/${party}/cordapps
     cp $directory/../shared/artifacts/tokens-workflows-$tokenVersion.jar dev/${nw}/build/nodes/${party}/cordapps

Original file line number	Diff line number	Diff line change
`@@ -310,11 +310,11 @@ func (s *SmartContract) GetHTLCHash(ctx contractapi.TransactionContextInterface,`
`310`	`310`	`func (s *SmartContract) GetHTLCHashByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {`
`311`	`311`	`return assetexchange.GetHTLCHashByContractId(ctx, contractId)`
`312`	`312`	`}`
`313`		`-func (s *SmartContract) GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {`
`314`		`- return assetexchange.GetHTLCHashPreImageByContractId(ctx, contractId)`
`315`		`-}`
`316`	`313`	`func (s *SmartContract) GetHTLCHashPreImage(ctx contractapi.TransactionContextInterface, callerChaincodeID, assetAgreementBytesBase64 string) (string, error) {`
`317`	`314`	`return assetexchange.GetHTLCHashPreImage(ctx, callerChaincodeID, assetAgreementBytesBase64)`
`318`	`315`	`}`
	`316`	`+func (s *SmartContract) GetHTLCHashPreImageByContractId(ctx contractapi.TransactionContextInterface, contractId string) (string, error) {`
	`317`	`+ return assetexchange.GetHTLCHashPreImageByContractId(ctx, contractId)`
	`318`	`+}`
`319`	`319`
`320`	`320`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@`
`16`	`16`	`{`
`17`	`17`	`"principal": "<mspid>",`
`18`	`18`	`"principalType": "ca",`
`19`		`- "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",`
	`19`	`+ "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",`
`20`	`20`	`"read": true`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"principal": "<mspid>",`
`24`	`24`	`"principalType": "ca",`
`25`		`- "resource": "mychannel:simpleasset:GetHTLCHashPreImage:*",`
	`25`	`+ "resource": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",`
`26`	`26`	`"read": true`
`27`	`27`	`}`
`28`	`28`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- "pattern": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",`
	`19`	`+ "pattern": "mychannel:simpleasset:GetHTLCHashPreImage:*",`
`20`	`20`	`"policy": {`
`21`	`21`	`"type": "Signature",`
`22`	`22`	`"criteria": []`
`23`	`23`	`}`
`24`	`24`	`},`
`25`	`25`	`{`
`26`		`- "pattern": "mychannel:simpleasset:GetHTLCHashPreImage:*",`
	`26`	`+ "pattern": "mychannel:simpleasset:GetHTLCHashPreImageByContractId:*",`
`27`	`27`	`"policy": {`
`28`	`28`	`"type": "Signature",`
`29`	`29`	`"criteria": []`