Feature branch: PLT scheduler ported to Rust

.github/workflows/build-test.yaml

@@ -34,6 +34,7 @@ on:
     - 'concordium-consensus/smart-contracts'
     - 'concordium-consensus/haskell-lmdb'
     - 'concordium-node/rustfmt.toml'
+    - 'plt'
 
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
@@ -48,17 +49,19 @@ on:
     - 'concordium-consensus/smart-contracts'
     - 'concordium-consensus/haskell-lmdb'
     - 'concordium-node/rustfmt.toml'
+    - 'plt'
   workflow_dispatch: # allow manual trigger
 
 env:
   dummy: 17                # change to force cache invalidation
   CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
+  RUST_VERSION: 1.86
+  GHC_VERSION: 9.10.2
 
 jobs:
 
   fourmolu:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
     steps:
 
     - name: Download fourmolu
@@ -93,25 +96,17 @@ jobs:
 
   rustfmt:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
-
-    strategy:
-      matrix:
-        plan:
-        - rust: "1.82"
-
     steps:
     - name: Checkout
       uses: actions/checkout@v2
       with:
-        # token: ${{ secrets.CONCORDIUM_CI }}
         submodules: recursive
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: ${{ matrix.plan.rust }}
+        toolchain: ${{ env.RUST_VERSION }}
         override: true
         components: rustfmt
 
@@ -127,13 +122,6 @@ jobs:
     needs: [fourmolu, rustfmt]
     # Use fixed OS version because we install packages on the system.
     runs-on: ubuntu-22.04
-    if: ${{ !github.event.pull_request.draft }}
-
-    strategy:
-      matrix:
-        plan:
-        - rust: 1.82
-          ghc: 9.10.2
 
     steps:
     - name: Remove unnecessary files
@@ -164,7 +152,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: ${{ matrix.plan.rust }}
+        toolchain: ${{ env.RUST_VERSION }}
         override: true
         components: clippy, llvm-tools
         target: x86_64-pc-windows-gnu
@@ -184,10 +172,10 @@ jobs:
           concordium-base/smart-contracts/lib
           concordium-node/target
           collector/target
-        key: ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}-${{ hashFiles('concordium-base/rust-src/**/*.rs','concordium-base/smart-contracts/wasm-chain-integration/**/*.rs')}}
+        key: ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ env.RUST_VERSION }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}-${{ hashFiles('concordium-base/rust-src/**/*.rs','concordium-base/smart-contracts/wasm-chain-integration/**/*.rs')}}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
-          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ matrix.plan.rust }}
+          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ env.RUST_VERSION }}-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}
+          ${{ runner.os }}-${{ env.dummy }}-rust-deps-${{ env.RUST_VERSION }}
 
     # HASKELL #
 
@@ -208,9 +196,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}
+        key: ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ matrix.plan.ghc }}
+          ${{ runner.os }}-${{ env.dummy }}-stack-global-${{ env.GHC_VERSION }}
     - name: Cache '.stack-work'
       uses: actions/cache@v4
       with:
@@ -220,11 +208,11 @@ jobs:
           concordium-consensus/.stack-work
           concordium-consensus/haskell-lmdb/.stack-work
 
-        key: ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-${{ steps.cache-keys.outputs.base_hash }}
+        key: ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-${{ steps.cache-keys.outputs.base_hash }}
         restore-keys: |
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}-${{ hashFiles('**.yaml') }}-
-          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ matrix.plan.ghc }}
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-${{ steps.cache-keys.outputs.proto_hash }}-
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}-${{ hashFiles('**.yaml') }}-
+          ${{ runner.os }}-${{ env.dummy }}-stack-work-${{ env.GHC_VERSION }}
 
     # Compile Haskell sources. This must be done before running checks or tests on the Rust sources.
     - name: Build consensus and run tests

.github/workflows/plt-build-test.yaml

@@ -0,0 +1,51 @@
+name: PLT scheduler build and run tests
+
+on:
+  push:
+    branches:
+    - main
+    paths:
+    - '.github/workflows/plt-build-test.yaml'
+    - 'concordium-base'
+    - 'plt'
+
+  pull_request:
+    paths:
+    - '.github/workflows/plt-build-test.yaml'
+    - 'concordium-base'
+    - 'plt'
+env:
+  CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
+
+jobs:
+  rustfmt:
+    name: Check formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Run rustfmt
+        working-directory: plt
+        run: |
+          rustup component add rustfmt
+          cargo fmt --check
+
+  clippy_test:
+    name: Run Clippy and tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Clippy
+        working-directory: plt
+        run: |
+          rustup component add clippy
+          cargo clippy --locked --all-targets --all-features -- -D warnings
+      - name: Test
+        working-directory: plt
+        run: |
+          cargo test --locked --all-targets --all-features

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ on:
 env:
   UBUNTU_VERSION: '22.04'
   STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.10.2'
-  RUST_VERSION: '1.82'
+  RUST_VERSION: '1.86'
   STACK_VERSION: '3.7.1'
   FLATBUFFERS_VERSION: '23.5.26'
   GHC_VERSION: '9.10.2'

.gitignore

@@ -27,7 +27,6 @@ deps/internal/crypto/build
 *.ps
 scripts/static-libs/static-libs-docker/output_dir/
 result
-**/**/Cargo.lock
 0
 **/**/0
 scripts/genesis-data/genesis_data/**
@@ -49,6 +48,7 @@ genesis_data
 /concordium-consensus/a.out
 /concordium-consensus/HSdll.dll
 /concordium-consensus/HSdll.dll.a
+/concordium-consensus/lib
 concordium-node/deps/static-libs
 .dir-locals.el
 hie.yaml

collector/src/bin/collector.rs

@@ -11,7 +11,11 @@ use tonic::transport::{channel::Channel, ClientTlsConfig};
 #[macro_use]
 extern crate log;
 
-#[allow(clippy::large_enum_variant, clippy::enum_variant_names)]
+#[allow(
+    clippy::large_enum_variant,
+    clippy::enum_variant_names,
+    clippy::doc_overindented_list_items
+)]
 mod grpc {
     mod plt {
         tonic::include_proto!("concordium.v2.plt");
@@ -208,7 +212,7 @@ async fn main() {
 }
 
 #[allow(clippy::cognitive_complexity)]
-async fn collect_data<'a>(
+async fn collect_data(
     node_name: NodeName,
     grpc_host: String,
     conf: &ConfigCli,