Remove a couple of culprit dispute tests, in line with Polkajam PR #978

README.md

@@ -1,4 +1,4 @@
-# Test Vectors for the JAM Protocol (0.7.1)
+# Test Vectors for the JAM Protocol
 
 ## Classes
 

stf/disputes/README.md

@@ -29,18 +29,14 @@ tests that verify the invalidation of assignments following a verdict.
 - [progress_with_verdicts-6](tiny/progress_with_verdicts-6.json) 🟢
   - Not homogeneous judgements, results in wonky verdict
 - [progress_with_culprits-1](tiny/progress_with_culprits-1.json) 🔴
-  - Missing culprits for bad verdict
-- [progress_with_culprits-2](tiny/progress_with_culprits-2.json) 🔴
-  - Single culprit for bad verdict
-- [progress_with_culprits-3](tiny/progress_with_culprits-3.json) 🔴
   - Two culprits for bad verdict, not sorted
-- [progress_with_culprits-4](tiny/progress_with_culprits-4.json) 🟢
+- [progress_with_culprits-2](tiny/progress_with_culprits-2.json) 🟢
   - Two culprits for bad verdict, sorted
-- [progress_with_culprits-5](tiny/progress_with_culprits-5.json) 🔴
+- [progress_with_culprits-3](tiny/progress_with_culprits-3.json) 🔴
   - Report an already recorded verdict, with culprits
-- [progress_with_culprits-6](tiny/progress_with_culprits-6.json) 🔴
+- [progress_with_culprits-4](tiny/progress_with_culprits-4.json) 🔴
   - Culprit offender already in the offenders list
-- [progress_with_culprits-7](tiny/progress_with_culprits-7.json) 🔴
+- [progress_with_culprits-5](tiny/progress_with_culprits-5.json) 🔴
   - Offender relative to a not present verdict
 - [progress_with_faults-1](tiny/progress_with_faults-1.json) 🔴
   - Missing faults for good verdict

stf/disputes/disputes.asn

@@ -41,7 +41,6 @@ ErrorCode ::= ENUMERATED {
     judgements-not-sorted-unique (3),
     culprits-not-sorted-unique (4),
     faults-not-sorted-unique (5),
-    not-enough-culprits (6),
     not-enough-faults (7),
     culprits-verdict-not-bad (8),
     fault-verdict-wrong (9),

stf/disputes/disputes.py

@@ -50,7 +50,6 @@ class DisputesTestVector(StfTestVector):
         3: "judgements_not_sorted_unique",
         4: "culprits_not_sorted_unique",
         5: "faults_not_sorted_unique",
-        6: "not_enough_culprits",
         7: "not_enough_faults",
         8: "culprits_verdict_not_bad",
         9: "fault_verdict_wrong",

stf/disputes/full/progress_with_culprits-1.json

@@ -3424,7 +3424,18 @@
                     ]
                 }
             ],
-            "culprits": [],
+            "culprits": [
+                {
+                    "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
+                    "key": "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341",
+                    "signature": "0x63722acdfcb17943b657d72938162138d0fba7ec4bc6c5696fbc54ffdfe0a936bb314c2185d705c02eb441bb16e9bdb232c8bcc669e724875ce33dcd2ab42c0f"
+                },
+                {
+                    "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
+                    "key": "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
+                    "signature": "0x9a778d051dc8679b3bf67acb6e5f49ee18c55b3be99cd4b052e91df978343abeff0b2502fdae1b8c40e3ea40cd71671516cba724c31887c3ad7314b91a64c000"
+                }
+            ],
             "faults": []
         }
     },
@@ -16061,7 +16072,7 @@
         ]
     },
     "output": {
-        "err": "not_enough_culprits"
+        "err": "culprits_not_sorted_unique"
     },
     "post_state": {
         "psi": {

stf/disputes/full/progress_with_culprits-2.json

@@ -3429,6 +3429,11 @@
                     "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
                     "key": "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
                     "signature": "0x9a778d051dc8679b3bf67acb6e5f49ee18c55b3be99cd4b052e91df978343abeff0b2502fdae1b8c40e3ea40cd71671516cba724c31887c3ad7314b91a64c000"
+                },
+                {
+                    "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
+                    "key": "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341",
+                    "signature": "0x63722acdfcb17943b657d72938162138d0fba7ec4bc6c5696fbc54ffdfe0a936bb314c2185d705c02eb441bb16e9bdb232c8bcc669e724875ce33dcd2ab42c0f"
                 }
             ],
             "faults": []
@@ -16067,14 +16072,24 @@
         ]
     },
     "output": {
-        "err": "not_enough_culprits"
+        "ok": {
+            "offenders_mark": [
+                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
+                "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341"
+            ]
+        }
     },
     "post_state": {
         "psi": {
             "good": [],
-            "bad": [],
+            "bad": [
+                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
+            ],
             "wonky": [],
-            "offenders": []
+            "offenders": [
+                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
+                "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341"
+            ]
         },
         "rho": [
             null,

stf/disputes/full/progress_with_culprits-3.json

@@ -3427,13 +3427,13 @@
             "culprits": [
                 {
                     "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
-                    "key": "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341",
-                    "signature": "0x63722acdfcb17943b657d72938162138d0fba7ec4bc6c5696fbc54ffdfe0a936bb314c2185d705c02eb441bb16e9bdb232c8bcc669e724875ce33dcd2ab42c0f"
+                    "key": "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
+                    "signature": "0x9a778d051dc8679b3bf67acb6e5f49ee18c55b3be99cd4b052e91df978343abeff0b2502fdae1b8c40e3ea40cd71671516cba724c31887c3ad7314b91a64c000"
                 },
                 {
                     "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
-                    "key": "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
-                    "signature": "0x9a778d051dc8679b3bf67acb6e5f49ee18c55b3be99cd4b052e91df978343abeff0b2502fdae1b8c40e3ea40cd71671516cba724c31887c3ad7314b91a64c000"
+                    "key": "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341",
+                    "signature": "0x63722acdfcb17943b657d72938162138d0fba7ec4bc6c5696fbc54ffdfe0a936bb314c2185d705c02eb441bb16e9bdb232c8bcc669e724875ce33dcd2ab42c0f"
                 }
             ],
             "faults": []
@@ -3442,7 +3442,9 @@
     "pre_state": {
         "psi": {
             "good": [],
-            "bad": [],
+            "bad": [
+                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
+            ],
             "wonky": [],
             "offenders": []
         },
@@ -16072,12 +16074,14 @@
         ]
     },
     "output": {
-        "err": "culprits_not_sorted_unique"
+        "err": "already_judged"
     },
     "post_state": {
         "psi": {
             "good": [],
-            "bad": [],
+            "bad": [
+                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
+            ],
             "wonky": [],
             "offenders": []
         },

stf/disputes/full/progress_with_culprits-4.json

@@ -3444,7 +3444,9 @@
             "good": [],
             "bad": [],
             "wonky": [],
-            "offenders": []
+            "offenders": [
+                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace"
+            ]
         },
         "rho": [
             null,
@@ -16072,23 +16074,15 @@
         ]
     },
     "output": {
-        "ok": {
-            "offenders_mark": [
-                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
-                "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341"
-            ]
-        }
+        "err": "offender_already_reported"
     },
     "post_state": {
         "psi": {
             "good": [],
-            "bad": [
-                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
-            ],
+            "bad": [],
             "wonky": [],
             "offenders": [
-                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
-                "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341"
+                "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace"
             ]
         },
         "rho": [

stf/disputes/full/progress_with_culprits-5.json

@@ -3430,6 +3430,11 @@
                     "key": "0x4418fb8c85bb3985394a8c2756d3643457ce614546202a2f50b093d762499ace",
                     "signature": "0x9a778d051dc8679b3bf67acb6e5f49ee18c55b3be99cd4b052e91df978343abeff0b2502fdae1b8c40e3ea40cd71671516cba724c31887c3ad7314b91a64c000"
                 },
+                {
+                    "target": "0xe12c22d4f162d9a012c9319233da5d3e923cc5e1029b8f90e47249c9ab256b35",
+                    "key": "0xad93247bd01307550ec7acd757ce6fb805fcf73db364063265b30a949e90d933",
+                    "signature": "0xc8d63a4378ac71db8b700357c15f7fc5e85c0346235195079febb4a7c2ed593df70ccacc78f5f001ea2bc5add7d612bb565518ff2d8849544a6de7a5d5222900"
+                },
                 {
                     "target": "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9",
                     "key": "0xcab2b9ff25c2410fbe9b8a717abb298c716a03983c98ceb4def2087500b8e341",
@@ -3442,9 +3447,7 @@
     "pre_state": {
         "psi": {
             "good": [],
-            "bad": [
-                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
-            ],
+            "bad": [],
             "wonky": [],
             "offenders": []
         },
@@ -16074,14 +16077,12 @@
         ]
     },
     "output": {
-        "err": "already_judged"
+        "err": "culprits_verdict_not_bad"
     },
     "post_state": {
         "psi": {
             "good": [],
-            "bad": [
-                "0x11da6d1f761ddf9bdb4c9d6e5303ebd41f61858d0a5647a1a7bfe089bf921be9"
-            ],
+            "bad": [],
             "wonky": [],
             "offenders": []
         },