Skip to content

Commit acaa0c2

Browse files
committed
update and fix error lint error
Signed-off-by: Osama Rabea <osrab3@gmail.com>
1 parent d09c491 commit acaa0c2

6 files changed

+33
-24
lines changed

e2e/__snapshots__/extendConfig.test.ts.snap

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5172,21 +5172,21 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-
51725172
],
51735173
"global": {
51745174
"capabilities": {
5175-
"application": "V2_0",
5175+
"application": "V2_5",
51765176
"channel": "V2_0",
51775177
"isV2": true,
51785178
"isV3": false,
51795179
"orderer": "V2_0",
51805180
},
51815181
"engine": "docker",
5182-
"fabricBaseosVersion": "2.4.7",
5182+
"fabricBaseosVersion": "2.5.12",
51835183
"fabricCaVersion": "1.5.5",
5184-
"fabricCcenvVersion": "2.4.7",
5185-
"fabricJavaenvVersion": "2.4",
5186-
"fabricNodeenvVersion": "2.4",
5184+
"fabricCcenvVersion": "2.5.12",
5185+
"fabricJavaenvVersion": "2.5",
5186+
"fabricNodeenvVersion": "2.5",
51875187
"fabricRecommendedNodeVersion": "16",
5188-
"fabricToolsVersion": "2.4.7",
5189-
"fabricVersion": "2.4.7",
5188+
"fabricToolsVersion": "2.5.12",
5189+
"fabricVersion": "2.5.12",
51905190
"monitoring": {
51915191
"loglevel": "info",
51925192
},
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml.tmpdir/fablo-target/.config/configstore/update-notifier-yo.json from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml 1`] = `
4+
"{
5+
"optOut": false,
6+
"lastUpdateCheck": 1755290146858
7+
}"
8+
`;
9+
10+
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml 1`] = `
11+
[
12+
"e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml.tmpdir/fablo-target/.config/configstore/update-notifier-yo.json",
13+
]
14+
`;

e2e/__snapshots__/fabloCommands.test.ts.snap

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3136,9 +3136,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1
31363136
"prefix": "orderer"
31373137
}
31383138
],
3139-
"tools": {
3140-
"fabloRest": true
3141-
}
3139+
"tools": {}
31423140
},
31433141
{
31443142
"organization": {
@@ -3156,9 +3154,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1
31563154
"db": "LevelDb",
31573155
"prefix": "peer"
31583156
},
3159-
"tools": {
3160-
"fabloRest": true
3161-
}
3157+
"tools": {}
31623158
}
31633159
],
31643160
"channels": [
@@ -3175,16 +3171,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1
31753171
]
31763172
}
31773173
],
3178-
"chaincodes": [
3179-
{
3180-
"name": "chaincode1",
3181-
"version": "0.0.1",
3182-
"lang": "node",
3183-
"channel": "my-channel1",
3184-
"directory": "./chaincodes/chaincode-kv-node",
3185-
"privateData": []
3186-
}
3187-
],
3174+
"chaincodes": [],
31883175
"hooks": {}
31893176
}"
31903177
`;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import performTests from "./performTests";
2+
3+
const config = "samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml";
4+
5+
describe(config, () => {
6+
performTests(config);
7+
});

e2e/fabloCommands.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ describe("validate", () => {
149149
const commandResult = commands.fabloExec(`validate ${fabloConfig}`);
150150

151151
// Then
152+
// expect(commandResult).toEqual(TestCommands.success());
152153
expect(commandResult.output).toContain("Chaincode name 'duplicateChaincode' is not unique");
153154
});
154155

samples/fablo-config-hlf2-2orgs-2chaincodes-private-data-duplicate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
$schema: "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json"
33
global:
4-
fabricVersion: "2.4.7"
4+
fabricVersion: "2.5.12"
55
tls: false
66

77
orgs:

0 commit comments

Comments
 (0)