Clean up and prepare for revising pbft

neatsys · Jun 26, 2024 · 767b52b · 767b52b
1 parent 73fc355
commit 767b52b
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,6 @@
 name: Cargo Build & Test
 
-on:
-  push:
-  pull_request:
+on: [push, pull_request]
 
 env: 
   CARGO_TERM_COLOR: always
@@ -13,10 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        toolchain:
-          - stable
-          - beta
-          # - nightly
+        toolchain: [stable, beta]
+        # toolchain: [stable, beta, nightly]
     steps:
       - uses: actions/checkout@v3
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,5 @@
 /target
 
-.vscode/settings.json
-
 *.pdf
 
 *.eif

diff --git a/.vscode/.gitignore b/.vscode/.gitignore
@@ -0,0 +1 @@
+settings.json
diff --git a/.vscode/settings.sample.json b/.vscode/settings.sample.json
@@ -1,10 +1,23 @@
 {
     "rust-analyzer.cargo.features": [
-        "all",
         // "wirehair",
+        "ordinary",
     ],
     "rust-analyzer.server.extraEnv": {
         "CHALK_OVERFLOW_DEPTH": "100000000",
-        "CHALK_SOLVER_MAX_SIZE": "10000000"
+        "CHALK_SOLVER_MAX_SIZE": "10000000",
     },
+    "files.associations": {
+        "settings.sample.json": "jsonc",
+    },
+    "json.schemas": [
+        {
+            "fileMatch": [
+                "settings.sample.json"
+            ],
+            "schema": {
+                "allowTrailingCommas": true
+            }
+        }
+    ]
 }
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ strip = true
 
 # cSpell:disable
 [features]
-all = [
+ordinary = [
     "tikv-jemallocator",
     "nitro-enclaves",
     "reqwest",

diff --git a/examples/stress-session-timer.rs b/examples/stress-session-timer.rs
@@ -46,7 +46,7 @@ use augustus::event::{
 };
 use tokio::time::Instant;
 
-struct Foo;
+pub struct Foo;
 
 #[derive(Debug, derive_more::Display, derive_more::Error)]
 struct Exit;
@@ -76,7 +76,7 @@ impl OnTimer for Foo {
     }
 }
 
-struct Bar<E> {
+pub struct Bar<E> {
     sender: E,
     timer_id: Option<TimerId>,
     start: Instant,

diff --git a/src/cops.rs b/src/cops.rs
@@ -457,7 +457,7 @@ impl<M: ReplicaCommon> OnEvent<events::UpdateOk<M::V>>
                 .partial_cmp(state.version_deps.as_ref()),
             Some(Ordering::Greater)
         ));
-        state.value = put.value.clone();
+        state.value.clone_from(&put.value);
         state.version_deps = update_ok.version_deps.clone();
         let put_ok = PutOk {
             version_deps: update_ok.version_deps.clone(),
-Original file line number
+Diff line change
@@ -1,7 +1,5 @@
     /target
-    .vscode/settings.json
     *.pdf
     *.eif
@@ Expand Down @@