Workaround make audit failure for rust-nix

Makefile

@@ -80,12 +80,20 @@ build-release-tarballs:
 # Runs the full workspace tests in **release**, without downloading any additional
 # test vectors.
 test-release:
-	cargo test --workspace --release --exclude ef_tests --exclude beacon_chain
+ifeq ($(OS),Windows_NT)
+	cargo test --workspace --release --exclude ef_tests --exclude beacon_chain --exclude psutil
+else
+	cargo test --workspace --release --exclude ef_tests --exclude beacon_chain --exclude psutil
+endif
 
 # Runs the full workspace tests in **debug**, without downloading any additional test
 # vectors.
 test-debug:
-	cargo test --workspace --exclude ef_tests --exclude beacon_chain
+ifeq ($(OS),Windows_NT)
+	cargo test --workspace --exclude ef_tests --exclude beacon_chain --exclude psutil
+else
+	cargo test --workspace --exclude ef_tests --exclude beacon_chain --exclude psutil
+endif
 
 # Runs cargo-fmt (linter).
 cargo-fmt:
@@ -134,7 +142,8 @@ lint:
         -D warnings \
         -A clippy::from-over-into \
         -A clippy::upper-case-acronyms \
-        -A clippy::vec-init-then-push
+        -A clippy::vec-init-then-push \
+        -A clippy::needless_borrow
 
 # Runs the makefile in the `ef_tests` repo.
 #

common/eth2/Cargo.toml

@@ -27,7 +27,8 @@ futures = "0.3.8"
 store = { path = "../../beacon_node/store", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-psutil = { version = "3.2.0", optional = true }
+#psutil = { version = "3.2.0", optional = true }
+psutil = { path = "../../common/rust-psutil", optional = true }
 procinfo = { version = "0.4.2", optional = true }
 
 [features]

common/rust-psutil/.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{js,jsx,ts,tsx,html,php,vim,toml,yml,json}]
+indent_size = 2
+
+[*.yml]
+indent_style = space
+
+[Makefile,*.go]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false

common/rust-psutil/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,19 @@
+---
+name: Bug report
+about: Template to report bugs.
+---
+
+<!--
+Before opening an issue, make sure to:
+	- search existing issues to avoid creating duplicates
+	- test using the latest release to make sure your issue has not already been fixed
+-->
+
+Please provide any of the following information if relevant:
+
+- rust-psutil version:
+- target platform info
+	- kernel version:
+	- architecture:
+	- (if linux) distro:
+- any relevant hardware info:

common/rust-psutil/.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,4 @@
+---
+name: Other
+about: No template.
+---

common/rust-psutil/.github/workflows/rust-ci.yml

@@ -0,0 +1,87 @@
+# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
+
+name: Rust CI
+
+on: [push, pull_request]
+
+jobs:
+  check:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macOS-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v1
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: clippy
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings

common/rust-psutil/.gitignore

@@ -0,0 +1,14 @@
+# Compiled files
+*.o
+*.so
+*.rlib
+*.dll
+
+# Executables
+*.exe
+
+# Generated by Cargo
+/target/
+
+# This is a library
+Cargo.lock

common/rust-psutil/.rustfmt.toml

@@ -0,0 +1 @@
+hard_tabs = true