Merge pull request #149 from mlswg/commit-scripts

Update commit scripts
mlswg · Mar 17, 2023 · 181803a · 181803a
2 parents 91438e7 + 2120087
commit 181803a
Showing 1 changed file with 132 additions and 32 deletions.
diff --git a/interop/configs/commit.json b/interop/configs/commit.json
@@ -12,28 +12,50 @@
 
       {"action": "createKeyPackage", "actor": "charlie1"},
       {"action": "createKeyPackage", "actor": "charlie2"},
+      {"action": "createKeyPackage", "actor": "charlie3"},
       {"action": "addProposal", "actor": "alice", "keyPackage": 2},
       {"action": "addProposal", "actor": "bob", "keyPackage": 3},
-      {"action": "fullCommit", "actor": "alice", "byReference": [4, 5], "members": ["bob"], "joiners": ["charlie1", "charlie2"], "force_path": true},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [5, 6],
+        "byValue": [{"proposalType": "add", "keyPackage": 4}],
+        "members": ["bob"],
+        "joiners": ["charlie1", "charlie2", "charlie3"],
+        "force_path": true
+      },
 
-      {"action": "createKeyPackage", "actor": "charlie3"},
       {"action": "createKeyPackage", "actor": "charlie4"},
-      {"action": "addProposal", "actor": "alice", "keyPackage": 7},
-      {"action": "addProposal", "actor": "bob", "keyPackage": 8},
-      {"action": "fullCommit", "actor": "alice", "byReference": [9, 10], "members": ["bob", "charlie1", "charlie2"], "joiners": ["charlie3", "charlie4"], "force_path": false}
+      {"action": "createKeyPackage", "actor": "charlie5"},
+      {"action": "createKeyPackage", "actor": "charlie6"},
+      {"action": "addProposal", "actor": "alice", "keyPackage": 8},
+      {"action": "addProposal", "actor": "bob", "keyPackage": 9},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [11, 12],
+        "byValue": [{"proposalType": "add", "keyPackage": 10}],
+        "members": ["bob", "charlie1", "charlie2"],
+        "joiners": ["charlie4", "charlie5", "charlie6"],
+        "force_path": false
+      }
     ],
 
     "remove": [
       {"action": "createGroup", "actor": "alice"},
       {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
+
       {"action": "createKeyPackage", "actor": "charlie1"},
       {"action": "createKeyPackage", "actor": "charlie2"},
+      {"action": "createKeyPackage", "actor": "charlie3"},
       {"action": "addProposal", "actor": "alice", "keyPackage": 2},
       {"action": "addProposal", "actor": "alice", "keyPackage": 3},
-      {"action": "fullCommit", "actor": "alice", "byReference": [4, 5], "members": ["bob"], "joiners": ["charlie1", "charlie2"]},
+      {"action": "addProposal", "actor": "alice", "keyPackage": 4},
+      {"action": "fullCommit", "actor": "alice", "byReference": [5, 6, 7], "members": ["bob"], "joiners": ["charlie1", "charlie2", "charlie3"]},
+
       {"action": "removeProposal", "actor": "alice", "removed": "charlie1"},
       {"action": "removeProposal", "actor": "bob", "removed": "charlie2"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [7, 8], "members": ["bob"]}
+      {"action": "fullCommit", "actor": "alice", "byReference": [9, 10], "byValue": [{"proposalType": "remove", "removed": "charlie3"}], "members": ["bob"]}
     ],
 
     "update": [
@@ -46,48 +68,89 @@
     "group_context_extensions": [
       {"action": "createGroup", "actor": "alice"},
       {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
+
       {"action": "groupContextExtensionsProposal", "actor": "alice", "extensions": [
-        {"extension_type": 123, "extension_data": "aGVsbG8="},
-        {"extension_type": 321, "extension_data": "d29ybGQ="}
+        {"extension_type": 3, "extension_data": "AAAA"},
+        {"extension_type": 5, "extension_data": "AA=="}
       ]},
       {"action": "fullCommit", "actor": "alice", "byReference": [2], "members": ["bob"]},
-      {"action": "groupContextExtensionsProposal", "actor": "bob", "extensions": [
-        {"extension_type": 123, "extension_data": "aGVsbG8="},
-        {"extension_type": 321, "extension_data": "d29ybGQ="}
-      ]},
-      {"action": "fullCommit", "actor": "alice", "byReference": [4], "members": ["bob"]}
+
+      {"action": "groupContextExtensionsProposal", "actor": "bob", "extensions": []},
+      {"action": "fullCommit", "actor": "alice", "byReference": [4], "members": ["bob"]},
+
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byValue": [
+          {
+            "proposalType": "groupContextExtensions",
+            "extensions": [{"extension_type": 3, "extension_data": "AAAA"}]
+          }
+        ],
+        "members": ["bob"]
+      }
     ],
 
     "external_psk": [
       {"action": "createGroup", "actor": "alice"},
       {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
       {"action": "installExternalPSK", "clients": ["alice", "bob"]},
       {"action": "installExternalPSK", "clients": ["alice", "bob"]},
+      {"action": "installExternalPSK", "clients": ["alice", "bob"]},
 
       {"action": "externalPSKProposal", "pskID": 2, "actor": "alice"},
       {"action": "externalPSKProposal", "pskID": 3, "actor": "bob"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [4, 5], "members": ["bob"], "force_path": true},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [5, 6],
+        "byValue": [{"proposalType": "externalPSK", "pskID": 4}],
+        "members": ["bob"],
+        "force_path": true
+      },
 
       {"action": "externalPSKProposal", "pskID": 2, "actor": "alice"},
       {"action": "externalPSKProposal", "pskID": 3, "actor": "bob"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [7, 8], "members": ["bob"], "force_path": false}
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [8, 9],
+        "byValue": [{"proposalType": "externalPSK", "pskID": 4}],
+        "members": ["bob"],
+        "force_path": false
+      }
     ],
 
     "resumption_psk": [
       {"action": "createGroup", "actor": "alice"},
       {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
       {"action": "fullCommit", "actor": "alice", "members": ["bob"]},
+      {"action": "fullCommit", "actor": "alice", "members": ["bob"]},
 
       {"action": "resumptionPSKProposal", "epochID": 1, "actor": "alice"},
-      {"action": "resumptionPSKProposal", "epochID": 1, "actor": "bob"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [3, 4], "members": ["bob"], "force_path": true},
+      {"action": "resumptionPSKProposal", "epochID": 2, "actor": "bob"},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [4, 5],
+        "byValue": [{"proposalType": "resumptionPSK", "epochID": 3}],
+        "members": ["bob"],
+        "force_path": true
+      },
 
       {"action": "resumptionPSKProposal", "epochID": 2, "actor": "alice"},
-      {"action": "resumptionPSKProposal", "epochID": 2, "actor": "bob"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [6, 7], "members": ["bob"], "force_path": false}
+      {"action": "resumptionPSKProposal", "epochID": 3, "actor": "bob"},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [7, 8],
+        "byValue": [{"proposalType": "resumptionPSK", "epochID": 4}],
+        "members": ["bob"],
+        "force_path": true
+      }
     ],
 
-    "all_together": [
+    "all_together_alice_proposes": [
       {"action": "createGroup", "actor": "alice"},
       {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
       {"action": "createKeyPackage", "actor": "charlie1"},
@@ -96,29 +159,66 @@
       {"action": "addProposal", "actor": "alice", "keyPackage": 3},
       {"action": "fullCommit", "actor": "alice", "byReference": [4, 5], "members": ["bob"], "joiners": ["charlie1", "charlie2"]},
       {"action": "installExternalPSK", "clients": ["alice", "bob"]},
+      {"action": "installExternalPSK", "clients": ["alice", "bob"]},
 
       {"action": "createKeyPackage", "actor": "charlie3"},
-      {"action": "addProposal", "actor": "alice", "keyPackage": 8},
+      {"action": "addProposal", "actor": "alice", "keyPackage": 9},
       {"action": "removeProposal", "actor": "alice", "removed": "charlie1"},
       {"action": "groupContextExtensionsProposal", "actor": "alice", "extensions": [
-        {"extension_type": 123, "extension_data": "aGVsbG8="},
-        {"extension_type": 321, "extension_data": "d29ybGQ="}
+        {"extension_type": 3, "extension_data": "AAAA"},
+        {"extension_type": 5, "extension_data": "AA=="}
       ]},
       {"action": "externalPSKProposal", "pskID": 7, "actor": "alice"},
       {"action": "resumptionPSKProposal", "epochID": 1, "actor": "alice"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [9, 10, 11, 12, 13], "members": ["bob"]},
-
       {"action": "createKeyPackage", "actor": "charlie4"},
-      {"action": "addProposal", "actor": "bob", "keyPackage": 15},
-      {"action": "removeProposal", "actor": "bob", "removed": "charlie2"},
-      {"action": "updateProposal", "actor": "bob"},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [10, 11, 12, 13, 14],
+        "byValue": [
+          {"proposalType": "add", "keyPackage": 15},
+          {"proposalType": "remove", "removed": "charlie2"},
+          {"proposalType": "externalPSK", "pskID": 8},
+          {"proposalType": "resumptionPSK", "epochID": 2}
+        ],
+        "members": ["bob"]
+      }
+    ],
+
+    "all_together_bob_proposes": [
+      {"action": "createGroup", "actor": "alice"},
+      {"action": "externalJoin", "actor": "alice", "joiner": "bob"},
+      {"action": "createKeyPackage", "actor": "charlie1"},
+      {"action": "createKeyPackage", "actor": "charlie2"},
+      {"action": "addProposal", "actor": "alice", "keyPackage": 2},
+      {"action": "addProposal", "actor": "alice", "keyPackage": 3},
+      {"action": "fullCommit", "actor": "alice", "byReference": [4, 5], "members": ["bob"], "joiners": ["charlie1", "charlie2"]},
+      {"action": "installExternalPSK", "clients": ["alice", "bob"]},
+      {"action": "installExternalPSK", "clients": ["alice", "bob"]},
+
+      {"action": "createKeyPackage", "actor": "charlie3"},
+      {"action": "addProposal", "actor": "bob", "keyPackage": 9},
+      {"action": "removeProposal", "actor": "bob", "removed": "charlie1"},
       {"action": "groupContextExtensionsProposal", "actor": "bob", "extensions": [
-        {"extension_type": 123, "extension_data": "aGVsbG8="},
-        {"extension_type": 321, "extension_data": "d29ybGQ="}
+        {"extension_type": 3, "extension_data": "AAAA"},
+        {"extension_type": 5, "extension_data": "AA=="}
       ]},
       {"action": "externalPSKProposal", "pskID": 7, "actor": "bob"},
       {"action": "resumptionPSKProposal", "epochID": 1, "actor": "bob"},
-      {"action": "fullCommit", "actor": "alice", "byReference": [16, 17, 18, 19, 20, 21], "members": ["bob"]}
+      {"action": "updateProposal", "actor": "bob"},
+      {"action": "createKeyPackage", "actor": "charlie4"},
+      {
+        "action": "fullCommit",
+        "actor": "alice",
+        "byReference": [10, 11, 12, 13, 14, 15],
+        "byValue": [
+          {"proposalType": "add", "keyPackage": 16},
+          {"proposalType": "remove", "removed": "charlie2"},
+          {"proposalType": "externalPSK", "pskID": 8},
+          {"proposalType": "resumptionPSK", "epochID": 2}
+        ],
+        "members": ["bob"]
+      }
     ]
   }
 }