commit aed6040b38070a0ef57e7334c500501856946d92
from: Sergey Bronnikov <estetus@gmail.com>
date: Fri Dec 09 08:31:23 2022 UTC

Bump Elle and Jepsen

Update Jepsen [1] and Elle [2] libraries to the latest versions.
History paper-example.{edn,json} has been updated and field `:process`
been added, see [3].

1. https://github.com/jepsen-io/jepsen/releases/tag/v0.3.0
2. https://github.com/jepsen-io/elle/releases/tag/v0.1.6
3. https://github.com/jepsen-io/elle/issues/20

commit - c1cf3d6509003d227dc3528a0de45385577c58f7
commit + aed6040b38070a0ef57e7334c500501856946d92
blob - 76a60d6d479adbab3b6e45f0949ffff926fcac48
blob + f948cd8814cf71fa6e39506521708ed00a9eeb0b
--- CHANGELOG.md
+++ CHANGELOG.md
@@ -14,6 +14,8 @@ change log follows the conventions of
 
 ### Changed
 
+- Bump Elle version to 0.1.6.
+- Bump Jepsen version to 0.3.0.
 
 ## [0.1.5] - 2022-12-06
 
blob - 72bc3d96b5e18bbd2a096168bf3500688f611227
blob + a7944fb35f56165569ebfe065161b85dd8413834
--- histories/elle/paper-example.edn
+++ histories/elle/paper-example.edn
@@ -1,8 +1,8 @@
-{:index 0 :type :invoke  :value [[:append 253 1] [:append 253 3] [:append 253 4] [:append 255 2] [:append 255 3] [:append 255 4] [:append 255 5] [:append 256 1] [:append 256 2]]}
-{:index 1 :type :ok      :value [[:append 253 1] [:append 253 3] [:append 253 4] [:append 255 2] [:append 255 3] [:append 255 4] [:append 255 5] [:append 256 1] [:append 256 2]]}
-{:index 2 :type :invoke, :value [[:append 255 8] [:r 253 nil]]}
-{:index 3 :type :ok,     :value [[:append 255 8] [:r 253 [1 3 4]]]}
-{:index 4 :type :invoke, :value [[:append 256 4] [:r 255 nil] [:r 256 nil] [:r 253 nil]]}
-{:index 5 :type :ok,     :value [[:append 256 4] [:r 255 [2 3 4 5 8]] [:r 256 [1 2 4]] [:r 253 [1 3 4]]]}
-{:index 6 :type :invoke, :value [[:append 250 10] [:r 253 nil] [:r 255 nil] [:append 256 3]]}
-{:index 7 :type :ok      :value [[:append 250 10] [:r 253 [1 3 4]] [:r 255 [2 3 4 5]] [:append 256 3]]}
+{:index 0 :process 1 :type :invoke  :value [[:append 253 1] [:append 253 3] [:append 253 4] [:append 255 2] [:append 255 3] [:append 255 4] [:append 255 5] [:append 256 1] [:append 256 2]]}
+{:index 1 :process 1 :type :ok      :value [[:append 253 1] [:append 253 3] [:append 253 4] [:append 255 2] [:append 255 3] [:append 255 4] [:append 255 5] [:append 256 1] [:append 256 2]]}
+{:index 2 :process 1 :type :invoke, :value [[:append 255 8] [:r 253 nil]]}
+{:index 3 :process 1 :type :ok,     :value [[:append 255 8] [:r 253 [1 3 4]]]}
+{:index 4 :process 1 :type :invoke, :value [[:append 256 4] [:r 255 nil] [:r 256 nil] [:r 253 nil]]}
+{:index 5 :process 1 :type :ok,     :value [[:append 256 4] [:r 255 [2 3 4 5 8]] [:r 256 [1 2 4]] [:r 253 [1 3 4]]]}
+{:index 6 :process 1 :type :invoke, :value [[:append 250 10] [:r 253 nil] [:r 255 nil] [:append 256 3]]}
+{:index 7 :process 1 :type :ok      :value [[:append 250 10] [:r 253 [1 3 4]] [:r 255 [2 3 4 5]] [:append 256 3]]}
blob - 77b14529313782c56fe1f6d89df319852f137945
blob + 4ad0e473d8a4573749c4e8624d70045acb5e46fd
--- histories/elle/paper-example.json
+++ histories/elle/paper-example.json
@@ -1,8 +1,8 @@
-[{"index":0,"type":"invoke","value":[["append",253,1],["append",253,3],["append",253,4],["append",255,2],["append",255,3],["append",255,4],["append",255,5],["append",256,1],["append",256,2]]},
-{"index":1,"type":"ok","value":[["append",253,1],["append",253,3],["append",253,4],["append",255,2],["append",255,3],["append",255,4],["append",255,5],["append",256,1],["append",256,2]]},
-{"index":2,"type":"invoke","value":[["append",255,8],["r",253,null]]},
-{"index":3,"type":"ok","value":[["append",255,8],["r",253,[1,3,4]]]},
-{"index":4,"type":"invoke","value":[["append",256,4],["r",255,null],["r",256,null],["r",253,null]]},
-{"index":5,"type":"ok","value":[["append",256,4],["r",255,[2,3,4,5,8]],["r",256,[1,2,4]],["r",253,[1,3,4]]]},
-{"index":6,"type":"invoke","value":[["append",250,10],["r",253,null],["r",255,null],["append",256,3]]},
-{"index":7,"type":"ok","value":[["append",250,10],["r",253,[1,3,4]],["r",255,[2,3,4,5]],["append",256,3]]}]
+[{"index":0,"process":1,"type":"invoke","value":[["append",253,1],["append",253,3],["append",253,4],["append",255,2],["append",255,3],["append",255,4],["append",255,5],["append",256,1],["append",256,2]]},
+{"index":1,"process":1,"type":"ok","value":[["append",253,1],["append",253,3],["append",253,4],["append",255,2],["append",255,3],["append",255,4],["append",255,5],["append",256,1],["append",256,2]]},
+{"index":2,"process":1,"type":"invoke","value":[["append",255,8],["r",253,null]]},
+{"index":3,"process":1,"type":"ok","value":[["append",255,8],["r",253,[1,3,4]]]},
+{"index":4,"process":1,"type":"invoke","value":[["append",256,4],["r",255,null],["r",256,null],["r",253,null]]},
+{"index":5,"process":1,"type":"ok","value":[["append",256,4],["r",255,[2,3,4,5,8]],["r",256,[1,2,4]],["r",253,[1,3,4]]]},
+{"index":6,"process":1,"type":"invoke","value":[["append",250,10],["r",253,null],["r",255,null],["append",256,3]]},
+{"index":7,"process":1,"type":"ok","value":[["append",250,10],["r",253,[1,3,4]],["r",255,[2,3,4,5]],["append",256,3]]}]
blob - dff6b3ea4e88d953518acc39c05d076db9711757
blob + 7d93ef3a766737e5d97a62b4608a07c489864729
--- project.clj
+++ project.clj
@@ -13,6 +13,6 @@
                  [org.clojure/tools.logging "1.1.0"]
                  [org.clojure/data.json "2.4.0"]
                  [spootnik/unilog "0.7.28"] ; required by elle
-                 [elle "0.1.5"]
-                 [jepsen "0.2.7"]
+                 [elle "0.1.6"]
+                 [jepsen "0.3.0"]
                  [knossos "0.3.8"]])
blob - 4e08be26071a55ec73f573fb747c1f0bb2bbc0eb
blob + 4901eb50fd6ca85e369fca6ac97690423b986b9f
--- src/elle_cli/cli.clj
+++ src/elle_cli/cli.clj
@@ -12,6 +12,7 @@
             [jepsen.tests.bank :as jepsen-bank]
             [jepsen.tests.long-fork :as jepsen-long-fork]
             [jepsen.independent :as independent]
+            [jepsen.history :as h]
             [elle-cli.comments :as comments-model]
             [elle-cli.sequential :as sequential-model]
             [elle.list-append :as elle-list-append]
@@ -231,7 +232,7 @@
           (throw (Exception. (format "File not found: %s" filepath))))
 
         (let [read-history  (or read-history (read-fn-by-extension filepath))
-              history       (read-history filepath)
+              history       (h/history (read-history filepath))
               analysis      (check-history model-name history options)
               validness     (:valid? analysis)]