refactor

Author: cctdaniel

.pre-commit-config.yaml

@@ -1,26 +1,21 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
-  hooks:
-  - id: trailing-whitespace
-    files : program/
-  - id: end-of-file-fixer
-    files : program/
-  - id: check-added-large-files
-- repo: local
-  hooks:
-    - id: cargo-fmt
-      name: Cargo Fmt
-      language: "rust"
-      entry: cargo +nightly-2023-03-01 fmt
-      pass_filenames: false
-    - id: cargo-clippy-solana
-      name: Cargo Clippy Solana
-      language: "rust"
-      entry : cargo +nightly-2023-03-01 clippy --tests --features check -- -D warnings
-      pass_filenames : false
-    - id: cargo-clippy-pythnet
-      name: Cargo Clippy Pythnet
-      language: "rust"
-      entry : cargo +nightly-2023-03-01 clippy --tests --features pythnet,check -- -D warnings
-      pass_filenames : false
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+      - id: trailing-whitespace
+        files: program/
+      - id: end-of-file-fixer
+        files: program/
+      - id: check-added-large-files
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: Cargo Fmt
+        language: "rust"
+        entry: cargo +nightly-2023-03-01 fmt
+        pass_filenames: false
+      - id: cargo-clippy-pythnet
+        name: Cargo Clippy Pythnet
+        language: "rust"
+        entry: cargo +nightly-2023-03-01 clippy --tests -- -D warnings
+        pass_filenames: false

README.md

@@ -155,7 +155,7 @@ Finally, in docker extension inside VS Code click right and choose "Attach VS Co
 
 Oracle program upgrades are managed by the Pythian Council multisig. The steps to deploy a new version are:
 
-1. Create a release branch from `main`. This should include binary for the Pythnet oracle program (`pyth_oracle_pythnet.so`).
+1. Create a release branch from `main`. This should include the binary for the Pythnet oracle program (`pyth_oracle_pythnet.so`).
 2. [Install Solana CLI](https://docs.solana.com/cli/install-solana-cli-tools#use-solanas-install-tool) if not already installed.
 3. Set Solana config for the target network, e.g., devnet: `solana config set --url https://api.devnet.solana.com`.
 4. Execute `solana program write-buffer pyth_oracle_pythnet.so` to obtain the buffer address.

program/rust/Cargo.toml

@@ -46,7 +46,6 @@ lazy_static = "1.4.0"
 check = [] # Skips make build in build.rs, use with cargo-clippy and cargo-check
 debug = []
 library = []
-pythnet = [] # logic-affecting features start with this one
 
 [lib]
 crate-type = ["cdylib", "lib"]

program/rust/build.rs

@@ -12,7 +12,6 @@ use {
 fn main() {
     let target_arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
 
-    let has_feat_pythnet = std::env::var("CARGO_FEATURE_PYTHNET").is_ok();
     let has_feat_check = std::env::var("CARGO_FEATURE_CHECK").is_ok();
 
     // OUT_DIR is the path cargo provides to a build directory under `target/` specifically for
@@ -28,13 +27,11 @@ fn main() {
     let mut make_extra_flags = vec![];
     let mut clang_extra_flags = vec![];
 
-    if has_feat_pythnet {
-        // Define PC_PYTHNET for the C binary build
-        make_extra_flags.push("PC_PYTHNET=1");
+    // Define PC_PYTHNET for the C binary build
+    make_extra_flags.push("PC_PYTHNET=1");
 
-        // Define PC_PYTHNET for the bindings build
-        clang_extra_flags.push("-DPC_PYTHNET=1");
-    }
+    // Define PC_PYTHNET for the bindings build
+    clang_extra_flags.push("-DPC_PYTHNET=1");
 
     let mut make_targets = vec![];
     if target_arch == "bpf" {

program/rust/src/tests/pyth_simulator.rs

@@ -75,28 +75,6 @@ lazy_static::lazy_static! {
     // simulator. lazy_static makes this happen only once per test
     // run.
     static ref ORACLE_PROGRAM_BINARY_PATH: PathBuf = {
-
-    // Detect features and pass them onto cargo-build-bpf.
-    // IMPORTANT: All features of this crate must have gates added to this vector.
-    let features: Vec<&str> = vec!["pythnet"];
-
-    let mut cmd = std::process::Command::new("cargo");
-    cmd.arg("build-bpf");
-
-    if !features.is_empty() {
-        cmd.arg("--features");
-        cmd.args(features);
-    }
-
-    let status = cmd.status().unwrap();
-
-    if !status.success() {
-        panic!(
-        "cargo-build-bpf did not exit with 0 (code {:?})",
-        status.code()
-        );
-    }
-
     let target_dir = concat!(env!("CARGO_MANIFEST_DIR"), "/../../target");
 
     PathBuf::from(target_dir).join("deploy/pyth_oracle.so")

scripts/build-bpf.sh

@@ -20,9 +20,9 @@ set -x
 cd "${PYTH_DIR}"
 
 # Re-run tests affected by features
-cargo test --locked --features pythnet
+cargo test --locked
 
-cargo-build-bpf -- --locked -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort --features pythnet
+cargo-build-bpf -- --locked -Z build-std=std,panic_abort -Z build-std-features=panic_immediate_abort
 sha256sum ./target/**/*.so
 echo "Checking size of pyth_oracle.so for pythnet"
 ./scripts/check-size.sh 88429