Skip to content

Update dependencies for v1.2.0 #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2023
Merged

Update dependencies for v1.2.0 #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44b6607
Update dependencies for v1.2.0
nguyer Jan 31, 2023
2322d5c
Update contract migration E2E test config
nguyer Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -54,6 +54,6 @@
"release": "v1.2.0-alpha.1"
},
"cli": {
"tag": "v1.2.0-alpha.1"
"tag": "v1.2.0-rc.1"
}
}
4 changes: 4 additions & 0 deletions test/e2e/multiparty/contract_migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand All @@ -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)

Expand Down