Merge pull request #1171 from kaleido-io/v1.2.0-rc.2

Update dependencies for v1.2.0

Author: nguyer

manifest.json

@@ -6,8 +6,8 @@
   },
   "evmconnect": {
     "image": "ghcr.io/hyperledger/firefly-evmconnect",
-    "tag": "v1.2.0",
-    "sha": "ffb61bcde6c3536c6c3a5a5f097e7ad02aec6365972c4674e271d1f1625828c5"
+    "tag": "v1.2.1",
+    "sha": "5f5ada5da90e7e49ba60f82737f7613d6759134248faa363210b74d89996d9b8"
   },
   "fabconnect": {
     "image": "ghcr.io/hyperledger/firefly-fabconnect",
@@ -54,6 +54,6 @@
     "release": "v1.2.0-alpha.1"
   },
   "cli": {
-    "tag": "v1.2.0-alpha.1"
+    "tag": "v1.2.0-rc.1"
   }
 }

test/e2e/multiparty/contract_migration.go

@@ -56,11 +56,13 @@ func runMigrationTest(suite *ContractMigrationTestSuite, address1, address2 stri
 	suite.T().Logf("Test namespace: %s", testNamespace)
 
 	org := map[string]interface{}{}
+	node := map[string]interface{}{}
 	namespaceInfo := map[string]interface{}{
 		"name": testNamespace,
 		"multiparty": map[string]interface{}{
 			"enabled": true,
 			"org":     org,
+			"node":    node,
 			"contract": []map[string]interface{}{
 				{
 					"location": map[string]interface{}{"address": address1},
@@ -81,12 +83,14 @@ func runMigrationTest(suite *ContractMigrationTestSuite, address1, address2 stri
 	data1 := e2e.ReadConfig(suite.T(), suite.testState.configFile1)
 	org["name"] = suite.testState.org1.Name
 	org["key"] = suite.testState.org1key.Value
+	node["name"] = fmt.Sprintf("%s_node", suite.testState.org1.Name)
 	e2e.AddNamespace(data1, namespaceInfo)
 	e2e.WriteConfig(suite.T(), suite.testState.configFile1, data1)
 
 	data2 := e2e.ReadConfig(suite.T(), suite.testState.configFile2)
 	org["name"] = suite.testState.org2.Name
 	org["key"] = suite.testState.org2key.Value
+	node["name"] = fmt.Sprintf("%s_node", suite.testState.org2.Name)
 	e2e.AddNamespace(data2, namespaceInfo)
 	e2e.WriteConfig(suite.T(), suite.testState.configFile2, data2)