Merge branch 'main' into CI-tests

Author: OsamaRab3

e2e-network/TEST_CASES.md

@@ -2,7 +2,7 @@
 
 | Test case                 |    01-v2-simple    |   02-v2-raft-2orgs   | 03-v2-private-data |       04-v2-snapshot        |  test-05-v3  |  test-06-v3-bft |
 | ------------------------- |:---------------:|:-----------:|:----------:|:------------------------:|:------------------:|:---------------------:|
-| Fabric versions           |      2.4.7      |    2.3.2    |   2.5.9    |       2.3.3/2.4.2        |     3.0.0-beta     |      3.0.0-beta       |
+| Fabric versions           |      2.5.12      |    2.4.3    |   2.5.12    |       2.5.12        |     3.0.0     |      3.0.0       |
 | TLS                       |       no        |     yes     |     no     |           yes            |        yes         |          yes          |
 | Channel capabilities      |       v2        |     v2      |    v2_5    |            v2            |        v3_0        |          v3_0         |
 | Consensus                 |      solo       |    RAFT     |    solo    |           RAFT           |        RAFT        |          BFT          |

e2e-network/docker/expect-command.sh

@@ -15,7 +15,7 @@ response="$(eval "$command" 2>&1)"
 
 echo "$response"
 
-if echo "$response" | grep -a -F "$expected"; then
+if echo "$response" | grep -a -E "$expected"; then
   echo "✅ ok (cli): $command"
 else
   echo "❌ failed (cli): $command | expected: $expected"

e2e-network/docker/test-01-v2-simple.sh

@@ -89,4 +89,13 @@ expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
 # Put some data again
 expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
   '{"Args":["KVContract:put", "name", "James Bond"]}' \
-  '{\"success\":\"OK\"}'
+  '{\"success\":\"OK\"}'
+
+
+# Test export-network-topology to Mermaid
+cp -f "$FABLO_HOME/samples/fablo-config-hlf2-1org-1chaincode.json" "$TEST_TMP/simple-config.json"
+(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" export-network-topology simple-config.json simple-network-topology.mmd)
+expectCommand "head -n 1 \"$TEST_TMP/simple-network-topology.mmd\"" "graph TD"
+expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Org_Orderer"
+expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Org_Org1"
+expectCommand "cat \"$TEST_TMP/simple-network-topology.mmd\"" "Channel_my_channel1"

e2e-network/docker/test-02-v2-raft-2orgs.sh

@@ -10,10 +10,19 @@ export FABLO_HOME
 
 CONFIG="$FABLO_HOME/samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml"
 
+expectCommand() {
+  sh "$TEST_TMP/../expect-command.sh" "$1" "$2"
+}
+
 networkUp() {
   # separate generate and up is intentional just to check if it works
   "$FABLO_HOME/fablo-build.sh"
   (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" generate "$CONFIG")
+
+
+  # Check if the hook was executed (MaxMessageCount should be 1)
+  expectCommand "cat \"$TEST_TMP/fablo-target/fabric-config/configtx.yaml\"" "MaxMessageCount: 1$"
+
   (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" up)
 }