ci setup

.github/workflows/main.yml

@@ -0,0 +1,72 @@
+name: Main
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  NIGHTLY_TOOLCHAIN: nightly-2023-10-05
+  SOLANA_VERSION: 1.18.14
+
+jobs:
+  rust_fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: ~/.rustup/toolchains/${{ env.NIGHTLY_TOOLCHAIN }}
+          key: ${{ runner.os }}-rust-toolchain-${{ env.NIGHTLY_TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          components: rustfmt
+      - name: Run format
+        run: cargo +${{ env.NIGHTLY_TOOLCHAIN }} fmt --all -- --check
+
+  rust_clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: ~/.rustup/toolchains/${{ env.NIGHTLY_TOOLCHAIN }}
+          key: ${{ runner.os }}-rust-toolchain-${{ env.NIGHTLY_TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.NIGHTLY_TOOLCHAIN }}
+          components: clippy
+      - name: Run clippy
+        run: cargo +${{ env.NIGHTLY_TOOLCHAIN }} clippy --all -- --deny=warnings
+
+  cargo_build_test:
+    name: Cargo Build and Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: ~/.local/share/solana/install/active_release/bin/solana
+          key: ${{ runner.os }}-solana-${{ env.SOLANA_VERSION }}
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
+      - uses: metaplex-foundation/actions/install-solana@v1
+        with:
+          version: ${{ env.SOLANA_VERSION }}
+      - name: Build test program
+        run: cargo build-sbf --manifest-path test-program/Cargo.toml
+      - name: Test
+        run: cargo test

Cargo.toml

@@ -11,6 +11,7 @@ bincode = "1.3.3"
 num-format = "0.4.4"
 serde_json = "1.0.117"
 solana-bpf-loader-program = "1.18.14"
+solana-logger = "1.18.14"
 solana-program = "1.18.14"
 solana-program-runtime = "1.18.14"
 solana-system-program = "1.18.14"

bencher/Cargo.toml

@@ -9,3 +9,6 @@ mollusk = { path = "../harness" }
 num-format = { workspace = true }
 serde_json = { workspace = true }
 solana-sdk = { workspace = true }
+
+[dev-dependencies]
+solana-logger = { workspace = true }

bencher/tests/markdown.rs

@@ -7,6 +7,7 @@ use {
 #[test]
 fn test_markdown() {
     std::env::set_var("SBF_OUT_DIR", "../target/deploy");
+    solana_logger::setup_with("");
 
     let program_id = Pubkey::new_unique();
 

harness/Cargo.toml

@@ -9,7 +9,7 @@ solana-bpf-loader-program = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-system-program = { workspace = true }
 solana-sdk = { workspace = true }
-solana-logger = "2.0.0"
+solana-logger = { workspace = true }
 
 
 [[bench]]

harness/benches/ips.rs

@@ -1,11 +1,13 @@
 //! Benches Mollusk invocation (instructions per second)
-use criterion::{criterion_group, criterion_main, Criterion, Throughput};
-use mollusk::{result::Check, Mollusk};
-use solana_sdk::{
-    account::AccountSharedData, native_token::LAMPORTS_PER_SOL, pubkey::Pubkey, system_instruction,
-    system_program,
+use {
+    criterion::{criterion_group, criterion_main, Criterion, Throughput},
+    mollusk::{result::Check, Mollusk},
+    solana_sdk::{
+        account::AccountSharedData, native_token::LAMPORTS_PER_SOL, pubkey::Pubkey,
+        system_instruction, system_program,
+    },
+    solana_system_program::system_processor::DEFAULT_COMPUTE_UNITS,
 };
-use solana_system_program::system_processor::DEFAULT_COMPUTE_UNITS;
 
 fn transfer_checked_unchecked(c: &mut Criterion) {
     let sender = Pubkey::new_unique();

harness/tests/bpf_program.rs

@@ -207,7 +207,7 @@ fn test_close_account() {
             ],
             &[
                 Check::err(ProgramError::MissingRequiredSignature),
-                Check::compute_units(597),
+                Check::compute_units(598),
             ],
         );
     }
@@ -222,7 +222,7 @@ fn test_close_account() {
         ],
         &[
             Check::success(),
-            Check::compute_units(2557),
+            Check::compute_units(2558),
             Check::account(&key)
                 .data(&[])
                 .lamports(0)

rustfmt.toml

@@ -0,0 +1,5 @@
+comment_width = 80
+format_strings = true
+group_imports = "One"
+imports_granularity = "One"
+wrap_comments = true