PLT Workspace (#1480)

.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,6 +49,7 @@ on:
     - 'concordium-consensus/smart-contracts'
     - 'concordium-consensus/haskell-lmdb'
     - 'concordium-node/rustfmt.toml'
+    - 'plt'
   workflow_dispatch: # allow manual trigger
 
 env:

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

@@ -1,21 +1,19 @@
-name: PLT scheduler checks
+name: PLT scheduler build and run tests
 
 on:
   push:
     branches:
     - main
     paths:
-    - '.github/workflows/deployment-build-test.yaml'
+    - '.github/workflows/plt-build-test.yaml'
     - 'concordium-base'
-    - 'plt-deployment-unit'
-    - 'plt-scheduler'
+    - 'plt'
 
   pull_request:
     paths:
-    - '.github/workflows/plt-scheduler-build-test.yaml'
+    - '.github/workflows/plt-build-test.yaml'
     - 'concordium-base'
-    - 'plt-deployment-unit'
-    - 'plt-scheduler'
+    - 'plt'
 env:
   CARGO_TERM_COLOR: always # implicitly adds '--color=always' to all cargo commands
 
@@ -29,10 +27,10 @@ jobs:
         with:
           submodules: recursive
       - name: Run rustfmt
-        working-directory: plt-scheduler
+        working-directory: plt
         run: |
           rustup component add rustfmt
-          cargo fmt -- --check
+          cargo fmt --check
 
   clippy_test:
     name: Run Clippy and tests
@@ -43,10 +41,11 @@ jobs:
         with:
           submodules: recursive
       - name: Clippy
-        working-directory: plt-scheduler
+        working-directory: plt
         run: |
           rustup component add clippy
-          cargo clippy --all-targets --all-features --locked -- -D warnings
+          cargo clippy --locked --all-targets --all-features -- -D warnings
       - name: Test
-        working-directory: plt-scheduler
-        run: cargo test --all-targets --all-features
+        working-directory: plt
+        run: |
+          cargo test --locked --all-targets --all-features

.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/**

concordium-consensus/Setup.hs

@@ -21,8 +21,8 @@ runCmd verbosity cmd = do
 -- | Path to Concordium Smart Contract Engine rust crate relative to this file.
 smartContractEngineCrateRelative = "../concordium-base/smart-contracts/wasm-chain-integration"
 
--- | Path to plt-scheduler rust crate relative to this file.
-pltSchedulerCrateRelative = "../plt-scheduler"
+-- | Path to plt rust workspace relative to this file.
+pltWorkspaceRelative = "../plt"
 
 preConfHook :: Args -> ConfigFlags -> IO HookedBuildInfo
 preConfHook args flags = do
@@ -47,17 +47,17 @@ preConfHook args flags = do
             runCmd verbosity $ "ln -s -f " ++ smartContractEngineCrate ++ "/target/release/libconcordium_smart_contract_engine.so " ++ libraryDestination
 
     -- Build and copy/symlink PLT scheduler project
-    pltSchedulerCrate <- canonicalizePath pltSchedulerCrateRelative
-    runCmd verbosity $ "cargo build --release --locked --features ffi --manifest-path=" ++ pltSchedulerCrate ++ "/Cargo.toml"
+    pltWorkspace <- canonicalizePath pltWorkspaceRelative
+    runCmd verbosity $ "cargo build --release --locked --features ffi -p plt-scheduler --manifest-path=" ++ pltWorkspace ++ "/Cargo.toml"
     case buildOS of
         Windows -> do
-            runCmd verbosity $ "cp -u " ++ pltSchedulerCrate ++ "/target/release/plt_scheduler.dll " ++ libraryDestination
+            runCmd verbosity $ "cp -u " ++ pltWorkspace ++ "/target/release/plt_scheduler.dll " ++ libraryDestination
         OSX -> do
-            runCmd verbosity $ "ln -s -f " ++ pltSchedulerCrate ++ "/target/release/libplt_scheduler.a " ++ libraryDestination
-            runCmd verbosity $ "ln -s -f " ++ pltSchedulerCrate ++ "/target/release/libplt_scheduler.dylib " ++ libraryDestination
+            runCmd verbosity $ "ln -s -f " ++ pltWorkspace ++ "/target/release/libplt_scheduler.a " ++ libraryDestination
+            runCmd verbosity $ "ln -s -f " ++ pltWorkspace ++ "/target/release/libplt_scheduler.dylib " ++ libraryDestination
         _ -> do
-            runCmd verbosity $ "ln -s -f " ++ pltSchedulerCrate ++ "/target/release/libplt_scheduler.a " ++ libraryDestination
-            runCmd verbosity $ "ln -s -f " ++ pltSchedulerCrate ++ "/target/release/libplt_scheduler.so " ++ libraryDestination
+            runCmd verbosity $ "ln -s -f " ++ pltWorkspace ++ "/target/release/libplt_scheduler.a " ++ libraryDestination
+            runCmd verbosity $ "ln -s -f " ++ pltWorkspace ++ "/target/release/libplt_scheduler.so " ++ libraryDestination
     return emptyHookedBuildInfo
 
 -- | On Windows, copy the DLL files to the binary install directory. This is to ensure that they
@@ -70,8 +70,8 @@ postCopyHook _ flags pkgDescr lbi = case buildOS of
         smartContractEngineCrate <- canonicalizePath smartContractEngineCrateRelative
         runCmd verbosity $ "cp -u " ++ smartContractEngineCrate ++ "/target/release/concordium_smart_contract_engine.dll " ++ bindir installDirs
         -- Copy DLL for PLT scheduler
-        pltSchedulerCrate <- canonicalizePath pltSchedulerCrateRelative
-        runCmd verbosity $ "cp -u " ++ pltSchedulerCrate ++ "/target/release/plt_scheduler.dll " ++ bindir installDirs
+        pltWorkspace <- canonicalizePath pltWorkspaceRelative
+        runCmd verbosity $ "cp -u " ++ pltWorkspace ++ "/target/release/plt_scheduler.dll " ++ bindir installDirs
     _ -> return ()
   where
     distPref = fromFlag (copyDistPref flags)