Merge pull request #13 from pyth-network/abehjati/move-contract-test-to-a-local-crate

ali-behjati · web-flow · commit d9f187d89e92 · 2022-03-09T10:35:33.000+01:00
move contract test to a local crate
diff --git a/.github/workflows/pyth-sdk-solana.yml b/.github/workflows/pyth-sdk-solana.yml
@@ -17,6 +17,19 @@ jobs:
         working-directory: ./pyth-sdk-solana
     steps:
     - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: sudo apt-get install libudev-dev
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+  test-contract:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./pyth-sdk-solana/test-contract
+    steps:
+    - uses: actions/checkout@v2
     - name: Install dependencies
       run: sudo apt-get install libudev-dev
     - name: Install Solana Binaries
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,4 +3,5 @@
 members = [
     "pyth-sdk",
     "pyth-sdk-solana",
+    "pyth-sdk-solana/test-contract",
 ]
diff --git a/pyth-sdk-solana/Cargo.toml b/pyth-sdk-solana/Cargo.toml
@@ -10,10 +10,6 @@ description = "pyth price oracle data structures and example usage"
 keywords = [ "pyth", "solana", "oracle" ]
 readme = "README.md"
 
-[features]
-test-bpf = []
-no-entrypoint = []
-
 [dependencies]
 solana-program = "1.8.1"
 borsh = "0.9"
@@ -26,7 +22,6 @@ serde = { version = "1.0.136", features = ["derive"] }
 pyth-sdk = { path = "../pyth-sdk" }
 
 [dev-dependencies]
-solana-program-test = "1.8.1"
 solana-client = "1.8.1"
 solana-sdk = "1.8.1"
 
diff --git a/pyth-sdk-solana/README.md b/pyth-sdk-solana/README.md
@@ -21,13 +21,6 @@ Add a dependency to your Cargo.toml:
 pyth-sdk-solana="<version>"
 ```
 
-If you want to use this library in your on-chain program you should use `no-entrypoint` feature to prevent conflict between your program and this library's program.
-
-```toml
-[dependencies]
-pyth-sdk-solana = {version = "<version>", features = ["no-entrypoint"]}
-```
-
 See [pyth-sdk-solana on crates.io](https://crates.io/crates/pyth-sdk-solana/) to get the latest version of the library.
 
 ## Usage
@@ -188,7 +181,3 @@ product_account .. 6MEwdxe4g1NeAF9u6KDG14anJpFsVEa2cvr5H6iriFZ8
 This library can be built for either your native platform or in BPF (used by Solana programs). 
 Use `cargo build` / `cargo test` to build and test natively.
 Use `cargo build-bpf` / `cargo test-bpf` to build in BPF for Solana; these commands require you to have installed the [Solana CLI tools](https://docs.solana.com/cli/install-solana-cli-tools). 
-
-The BPF tests will also run an instruction count program that logs the resource consumption
-of various library functions.
-This program can also be run on its own using `cargo test-bpf --test instruction_count`.
diff --git a/pyth-sdk-solana/src/lib.rs b/pyth-sdk-solana/src/lib.rs
@@ -7,13 +7,6 @@ pub use self::error::PythError;
 mod error;
 pub mod state;
 
-pub mod entrypoint;
-pub mod instruction;
-pub mod processor;
-
-// This is used only in local testing.
-solana_program::declare_id!("PythC11111111111111111111111111111111111111");
-
 use state::load_price_account;
 
 pub use pyth_sdk::{
diff --git a/pyth-sdk-solana/test-contract/Cargo.toml b/pyth-sdk-solana/test-contract/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "test-contract"
+version = "0.1.0"
+edition = "2018"
+
+[features]
+test-bpf = []
+no-entrypoint = []
+
+[dependencies]
+pyth-sdk-solana = { path = "../" }
+solana-program = "1.8.1"
+bytemuck = "1.7.2"
+borsh = "0.9"
+borsh-derive = "0.9.0"
+
+[dev-dependencies]
+solana-program-test = "1.8.1"
+solana-client = "1.8.1"
+solana-sdk = "1.8.1"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/pyth-sdk-solana/test-contract/README.md b/pyth-sdk-solana/test-contract/README.md
@@ -0,0 +1,9 @@
+# Pyth SDK Solana Test Contract
+This contract is used to test pyth-sdk-solana onchain.
+
+## Development
+Use `cargo build-bpf` / `cargo test-bpf` to build in BPF for Solana; these commands require you to have installed the [Solana CLI tools](https://docs.solana.com/cli/install-solana-cli-tools). 
+
+The BPF tests will also run an instruction count program that logs the resource consumption
+of various library functions.
+This program can also be run on its own using `cargo test-bpf --test instruction_count`.
diff --git a/pyth-sdk-solana/test-contract/Xargo.toml b/pyth-sdk-solana/test-contract/Xargo.toml
diff --git a/pyth-sdk-solana/test-contract/src/entrypoint.rs b/pyth-sdk-solana/test-contract/src/entrypoint.rs
diff --git a/pyth-sdk-solana/test-contract/src/instruction.rs b/pyth-sdk-solana/test-contract/src/instruction.rs
@@ -2,13 +2,13 @@
 
 use bytemuck::bytes_of;
 
-use crate::state::PriceAccount;
-use crate::PriceStatus;
-
-use crate::{
-    id,
+use pyth_sdk_solana::state::PriceAccount;
+use pyth_sdk_solana::{
     PriceConf,
+    PriceStatus,
 };
+
+use crate::id;
 use borsh::{
     BorshDeserialize,
     BorshSerialize,
diff --git a/pyth-sdk-solana/test-contract/src/lib.rs b/pyth-sdk-solana/test-contract/src/lib.rs
@@ -0,0 +1,6 @@
+pub mod entrypoint;
+pub mod instruction;
+pub mod processor;
+
+// This is used only in local testing.
+solana_program::declare_id!("PythC11111111111111111111111111111111111111");
diff --git a/pyth-sdk-solana/test-contract/src/processor.rs b/pyth-sdk-solana/test-contract/src/processor.rs
@@ -7,7 +7,7 @@ use solana_program::program_error::ProgramError;
 use solana_program::pubkey::Pubkey;
 
 use crate::instruction::PythClientInstruction;
-use crate::load_price;
+use pyth_sdk_solana::load_price;
 
 pub fn process_instruction(
     _program_id: &Pubkey,
diff --git a/pyth-sdk-solana/test-contract/tests/common.rs b/pyth-sdk-solana/test-contract/tests/common.rs
@@ -1,14 +1,14 @@
-use pyth_sdk_solana::id;
-use pyth_sdk_solana::processor::process_instruction;
 use solana_program::instruction::Instruction;
 use solana_program_test::*;
 use solana_sdk::signature::Signer;
 use solana_sdk::transaction::Transaction;
+use test_contract::id;
+use test_contract::processor::process_instruction;
 
 // Panics if running instruction fails
 pub async fn test_instr_exec_ok(instr: Instruction) {
     let (mut banks_client, payer, recent_blockhash) =
-        ProgramTest::new("pyth_sdk_solana", id(), processor!(process_instruction))
+        ProgramTest::new("test_contract", id(), processor!(process_instruction))
             .start()
             .await;
     let mut transaction = Transaction::new_with_payer(&[instr], Some(&payer.pubkey()));
diff --git a/pyth-sdk-solana/test-contract/tests/instruction_count.rs b/pyth-sdk-solana/test-contract/tests/instruction_count.rs
@@ -1,7 +1,7 @@
-use pyth_sdk_solana::instruction;
 use solana_program_test::*;
+use test_contract::instruction;
 
-use pyth_sdk::PriceConf;
+use pyth_sdk_solana::PriceConf;
 
 mod common;
 use common::test_instr_exec_ok;
diff --git a/pyth-sdk-solana/test-contract/tests/stale_price.rs b/pyth-sdk-solana/test-contract/tests/stale_price.rs
@@ -1,6 +1,5 @@
 #![cfg(feature = "test-bpf")] // Only runs on bpf, where solana programs run
 
-use pyth_sdk_solana::instruction;
 use pyth_sdk_solana::state::{
     AccKey,
     AccountType,
@@ -15,6 +14,7 @@ use pyth_sdk_solana::state::{
     VERSION_2,
 };
 use solana_program_test::*;
+use test_contract::instruction;
 
 
 mod common;

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@`
`3`	`3`	`members = [`
`4`	`4`	`"pyth-sdk",`
`5`	`5`	`"pyth-sdk-solana",`
	`6`	`+ "pyth-sdk-solana/test-contract",`
`6`	`7`	`]`