Skip to content

Commit a21c6f0

Browse files
dzikowskidzikowski
committed
Impove mermaid diagrams
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent ce8f533 commit a21c6f0

10 files changed

+229
-207
lines changed

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -559,25 +559,29 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper
559559
"graph TD
560560
561561
subgraph Org_Orderer [Org: Orderer]
562-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
562+
direction RL
563+
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
564+
direction RL
565+
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
566+
end
567+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
563568
end
564569
565570
subgraph Org_Org1 [Org: Org1]
566-
CA_ca_Org1[CA: ca_Org1 - sqlite]
571+
direction RL
572+
CA_ca_Org1{CA: ca_Org1 - sqlite}
567573
Org1_peer0[Peer: peer0]
568574
Org1_peer1[Peer: peer1]
569575
end
570576
571577
subgraph Channel_my_channel1 [Channel: my-channel1]
572-
Chaincode_chaincode1[Chaincode: chaincode1]
578+
Chaincode_chaincode1[[Chaincode: chaincode1]]
573579
end
574580
575581
%% Connections
576-
Org_Orderer --> Channel_my_channel1
577-
Org_Org1 -.-> Channel_my_channel1
578582
Org1_peer0 --> Channel_my_channel1
579583
Org1_peer1 --> Channel_my_channel1
580-
"
584+
Channel_my_channel1 --> OrdererGroup_group1"
581585
`;
582586
583587
exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3540,23 +3540,27 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json should cre
35403540
"graph TD
35413541
35423542
subgraph Org_Orderer [Org: Orderer]
3543-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
3543+
direction RL
3544+
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
3545+
direction RL
3546+
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
3547+
end
3548+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
35443549
end
35453550
35463551
subgraph Org_Org1 [Org: Org1]
3547-
CA_ca_Org1[CA: ca_Org1 - postgres]
3552+
direction RL
3553+
CA_ca_Org1{CA: ca_Org1 - postgres}
35483554
Org1_peer0[Peer: peer0]
35493555
end
35503556
35513557
subgraph Channel_my_channel1 [Channel: my-channel1]
3552-
Chaincode_chaincode1[Chaincode: chaincode1]
3558+
Chaincode_chaincode1[[Chaincode: chaincode1]]
35533559
end
35543560
35553561
%% Connections
3556-
Org_Orderer --> Channel_my_channel1
3557-
Org_Org1 -.-> Channel_my_channel1
35583562
Org1_peer0 --> Channel_my_channel1
3559-
"
3563+
Channel_my_channel1 --> OrdererGroup_group1"
35603564
`;
35613565
35623566
exports[`samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3601,25 +3601,29 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
36013601
"graph TD
36023602
36033603
subgraph Org_Orderer [Org: Orderer]
3604-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
3604+
direction RL
3605+
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
3606+
direction RL
3607+
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
3608+
end
3609+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
36053610
end
36063611
36073612
subgraph Org_Org1 [Org: Org1]
3608-
CA_ca_Org1[CA: ca_Org1 - sqlite]
3613+
direction RL
3614+
CA_ca_Org1{CA: ca_Org1 - sqlite}
36093615
Org1_peer0[Peer: peer0]
36103616
Org1_peer1[Peer: peer1]
36113617
end
36123618
36133619
subgraph Channel_my_channel1 [Channel: my-channel1]
3614-
Chaincode_chaincode1[Chaincode: chaincode1]
3620+
Chaincode_chaincode1[[Chaincode: chaincode1]]
36153621
end
36163622
36173623
%% Connections
3618-
Org_Orderer --> Channel_my_channel1
3619-
Org_Org1 -.-> Channel_my_channel1
36203624
Org1_peer0 --> Channel_my_channel1
36213625
Org1_peer1 --> Channel_my_channel1
3622-
"
3626+
Channel_my_channel1 --> OrdererGroup_group1"
36233627
`;
36243628
36253629
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3786,30 +3786,33 @@ exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create
37863786
"graph TD
37873787
37883788
subgraph Org_Orderer [Org: Orderer]
3789-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
3789+
direction RL
3790+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
3791+
direction RL
3792+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
3793+
end
3794+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
37903795
end
37913796
37923797
subgraph Org_Org1 [Org: Org1]
3793-
CA_ca_Org1[CA: ca_Org1 - postgres]
3798+
direction RL
3799+
CA_ca_Org1{CA: ca_Org1 - postgres}
37943800
Org1_peer0[Peer: peer0]
37953801
end
37963802
37973803
subgraph Channel_my_channel1 [Channel: my-channel1]
3798-
Chaincode_chaincode1[Chaincode: chaincode1]
3804+
Chaincode_chaincode1[[Chaincode: chaincode1]]
37993805
end
38003806
38013807
subgraph Channel_my_channel2 [Channel: my-channel2]
3802-
Chaincode_chaincode1[Chaincode: chaincode1]
3808+
Chaincode_chaincode1[[Chaincode: chaincode1]]
38033809
end
38043810
38053811
%% Connections
3806-
Org_Orderer --> Channel_my_channel1
3807-
Org_Orderer --> Channel_my_channel2
3808-
Org_Org1 -.-> Channel_my_channel1
38093812
Org1_peer0 --> Channel_my_channel1
3810-
Org_Org1 -.-> Channel_my_channel2
38113813
Org1_peer0 --> Channel_my_channel2
3812-
"
3814+
Channel_my_channel1 --> OrdererGroup_group1
3815+
Channel_my_channel2 --> OrdererGroup_group1"
38133816
`;
38143817
38153818
exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create proper files from samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4558,33 +4558,37 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
45584558
"graph TD
45594559
45604560
subgraph Org_Orderer [Org: Orderer]
4561-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
4561+
direction RL
4562+
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
4563+
direction RL
4564+
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
4565+
end
4566+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
45624567
end
45634568
45644569
subgraph Org_Org1 [Org: Org1]
4565-
CA_ca_Org1[CA: ca_Org1 - sqlite]
4570+
direction RL
4571+
CA_ca_Org1{CA: ca_Org1 - sqlite}
45664572
Org1_peer0[Peer: peer0]
45674573
Org1_peer1[Peer: peer1]
45684574
end
45694575
45704576
subgraph Org_Org2 [Org: Org2]
4571-
CA_ca_Org2[CA: ca_Org2 - sqlite]
4577+
direction RL
4578+
CA_ca_Org2{CA: ca_Org2 - sqlite}
45724579
Org2_peer0[Peer: peer0]
45734580
end
45744581
45754582
subgraph Channel_my_channel1 [Channel: my-channel1]
4576-
Chaincode_or_policy_chaincode[Chaincode: or-policy-chaincode]
4577-
Chaincode_and_policy_chaincode[Chaincode: and-policy-chaincode]
4583+
Chaincode_or_policy_chaincode[[Chaincode: or-policy-chaincode]]
4584+
Chaincode_and_policy_chaincode[[Chaincode: and-policy-chaincode]]
45784585
end
45794586
45804587
%% Connections
4581-
Org_Orderer --> Channel_my_channel1
4582-
Org_Org1 -.-> Channel_my_channel1
45834588
Org1_peer0 --> Channel_my_channel1
45844589
Org1_peer1 --> Channel_my_channel1
4585-
Org_Org2 -.-> Channel_my_channel1
45864590
Org2_peer0 --> Channel_my_channel1
4587-
"
4591+
Channel_my_channel1 --> OrdererGroup_group1"
45884592
`;
45894593
45904594
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6524,62 +6524,68 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
65246524
"graph TD
65256525
65266526
subgraph Org_Orderer1 [Org: Orderer1]
6527-
CA_ca_Orderer1[CA: ca_Orderer1 - sqlite]
6527+
direction RL
6528+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
6529+
direction RL
6530+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
6531+
Orderer_orderer1_group1[Orderer: orderer1.group1 - etcdraft]
6532+
Orderer_orderer2_group1[Orderer: orderer2.group1 - etcdraft]
6533+
end
6534+
CA_ca_Orderer1{CA: ca_Orderer1 - sqlite}
65286535
end
65296536
65306537
subgraph Org_Orderer2 [Org: Orderer2]
6531-
CA_ca_Orderer2[CA: ca_Orderer2 - sqlite]
6538+
direction RL
6539+
subgraph OrdererGroup_group2 [Orderer Group: group2 solo]
6540+
direction RL
6541+
Orderer_orderer0_group2[Orderer: orderer0.group2 - solo]
6542+
end
6543+
CA_ca_Orderer2{CA: ca_Orderer2 - sqlite}
65326544
end
65336545
65346546
subgraph Org_Org1 [Org: Org1]
6535-
CA_ca_Org1[CA: ca_Org1 - sqlite]
6547+
direction RL
6548+
CA_ca_Org1{CA: ca_Org1 - sqlite}
65366549
Org1_peer0[Peer: peer0]
65376550
Org1_peer1[Peer: peer1]
65386551
end
65396552
65406553
subgraph Org_Org2 [Org: Org2]
6541-
CA_ca_Org2[CA: ca_Org2 - sqlite]
6554+
direction RL
6555+
CA_ca_Org2{CA: ca_Org2 - sqlite}
65426556
Org2_peer0[Peer: peer0]
65436557
Org2_peer1[Peer: peer1]
65446558
end
65456559
65466560
subgraph Channel_my_channel1 [Channel: my-channel1]
6547-
Chaincode_chaincode1[Chaincode: chaincode1]
6561+
Chaincode_chaincode1[[Chaincode: chaincode1]]
65486562
end
65496563
65506564
subgraph Channel_my_channel2 [Channel: my-channel2]
6565+
Channel_my_channel2_empty[" "]
6566+
style Channel_my_channel2_empty fill:#ffffff00,stroke:#ffffff00
65516567
end
65526568
65536569
subgraph Channel_my_channel3 [Channel: my-channel3]
6554-
Chaincode_chaincode2[Chaincode: chaincode2]
6570+
Chaincode_chaincode2[[Chaincode: chaincode2]]
65556571
end
65566572
65576573
%% Connections
6558-
Org_Orderer1 --> Channel_my_channel1
6559-
Org_Orderer1 --> Channel_my_channel2
6560-
Org_Orderer1 --> Channel_my_channel3
6561-
Org_Orderer2 --> Channel_my_channel1
6562-
Org_Orderer2 --> Channel_my_channel2
6563-
Org_Orderer2 --> Channel_my_channel3
6564-
Org_Org1 -.-> Channel_my_channel1
65656574
Org1_peer0 --> Channel_my_channel1
65666575
Org1_peer1 --> Channel_my_channel1
6567-
Org_Org2 -.-> Channel_my_channel1
65686576
Org2_peer0 --> Channel_my_channel1
65696577
Org2_peer1 --> Channel_my_channel1
6570-
Org_Org1 -.-> Channel_my_channel2
65716578
Org1_peer0 --> Channel_my_channel2
65726579
Org1_peer1 --> Channel_my_channel2
6573-
Org_Org2 -.-> Channel_my_channel2
65746580
Org2_peer0 --> Channel_my_channel2
65756581
Org2_peer1 --> Channel_my_channel2
6576-
Org_Org1 -.-> Channel_my_channel3
65776582
Org1_peer0 --> Channel_my_channel3
65786583
Org1_peer1 --> Channel_my_channel3
6579-
Org_Org2 -.-> Channel_my_channel3
65806584
Org2_peer0 --> Channel_my_channel3
65816585
Org2_peer1 --> Channel_my_channel3
6582-
"
6586+
Channel_my_channel1 --> OrdererGroup_group1
6587+
Channel_my_channel2 --> OrdererGroup_group1
6588+
Channel_my_channel3 --> OrdererGroup_group2"
65836589
`;
65846590
65856591
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`] = `

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7120,54 +7120,77 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
71207120
"graph TD
71217121
71227122
subgraph Org_Orderer [Org: Orderer]
7123-
CA_ca_Orderer[CA: ca_Orderer - sqlite]
7123+
direction RL
7124+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
7125+
direction RL
7126+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
7127+
Orderer_orderer1_group1[Orderer: orderer1.group1 - etcdraft]
7128+
end
7129+
CA_ca_Orderer{CA: ca_Orderer - sqlite}
71247130
end
71257131
71267132
subgraph Org_Org1 [Org: Org1]
7127-
CA_ca_Org1[CA: ca_Org1 - sqlite]
7133+
direction RL
7134+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
7135+
direction RL
7136+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
7137+
Orderer_orderer1_group1[Orderer: orderer1.group1 - etcdraft]
7138+
end
7139+
CA_ca_Org1{CA: ca_Org1 - sqlite}
71287140
Org1_peer0[Peer: peer0]
71297141
Org1_peer1[Peer: peer1]
71307142
end
71317143
71327144
subgraph Org_Org2 [Org: Org2]
7133-
CA_ca_Org2[CA: ca_Org2 - sqlite]
7145+
direction RL
7146+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
7147+
direction RL
7148+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
7149+
Orderer_orderer1_group1[Orderer: orderer1.group1 - etcdraft]
7150+
end
7151+
CA_ca_Org2{CA: ca_Org2 - sqlite}
71347152
Org2_peer0[Peer: peer0]
71357153
Org2_peer1[Peer: peer1]
71367154
end
71377155
71387156
subgraph Org_Org3 [Org: Org3]
7139-
CA_ca_Org3[CA: ca_Org3 - sqlite]
7157+
direction RL
7158+
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
7159+
direction RL
7160+
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
7161+
Orderer_orderer1_group1[Orderer: orderer1.group1 - etcdraft]
7162+
end
7163+
CA_ca_Org3{CA: ca_Org3 - sqlite}
71407164
Org3_peer0[Peer: peer0]
71417165
Org3_peer1[Peer: peer1]
71427166
end
71437167
71447168
subgraph Channel_my_channel1 [Channel: my-channel1]
7145-
Chaincode_chaincode1[Chaincode: chaincode1]
7169+
Chaincode_chaincode1[[Chaincode: chaincode1]]
71467170
end
71477171
71487172
subgraph Channel_my_channel2 [Channel: my-channel2]
7173+
Channel_my_channel2_empty[" "]
7174+
style Channel_my_channel2_empty fill:#ffffff00,stroke:#ffffff00
71497175
end
71507176
71517177
subgraph Channel_my_channel3 [Channel: my-channel3]
7178+
Channel_my_channel3_empty[" "]
7179+
style Channel_my_channel3_empty fill:#ffffff00,stroke:#ffffff00
71527180
end
71537181
71547182
%% Connections
7155-
Org_Orderer --> Channel_my_channel1
7156-
Org_Orderer --> Channel_my_channel2
7157-
Org_Orderer --> Channel_my_channel3
7158-
Org_Org1 -.-> Channel_my_channel1
71597183
Org1_peer0 --> Channel_my_channel1
71607184
Org1_peer1 --> Channel_my_channel1
7161-
Org_Org2 -.-> Channel_my_channel2
71627185
Org2_peer0 --> Channel_my_channel2
71637186
Org2_peer1 --> Channel_my_channel2
7164-
Org_Org1 -.-> Channel_my_channel3
71657187
Org1_peer0 --> Channel_my_channel3
71667188
Org1_peer1 --> Channel_my_channel3
7167-
Org_Org2 -.-> Channel_my_channel3
71687189
Org2_peer0 --> Channel_my_channel3
71697190
Org2_peer1 --> Channel_my_channel3
7170-
"
7191+
Channel_my_channel1 --> OrdererGroup_group1
7192+
Channel_my_channel2 --> OrdererGroup_group1
7193+
Channel_my_channel3 --> OrdererGroup_group1"
71717194
`;
71727195
71737196
exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should create proper files from samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json 1`] = `

0 commit comments

Comments
 (0)