Skip to content

Commit

Permalink
Bump Elle and Jepsen
Browse files Browse the repository at this point in the history
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. jepsen-io/elle#20
  • Loading branch information
ligurio committed Dec 9, 2022
1 parent c1cf3d6 commit a823fef
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions histories/elle/paper-example.edn
Original file line number Diff line number Diff line change
@@ -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]]}
16 changes: 8 additions & 8 deletions histories/elle/paper-example.json
Original file line number Diff line number Diff line change
@@ -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]]}]
4 changes: 2 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]])
3 changes: 2 additions & 1 deletion src/elle_cli/cli.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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)]

Expand Down

0 comments on commit a823fef

Please sign in to comment.