Updating tests and fixing CI

openbook-dex · Sep 11, 2023 · 891a42c · 891a42c
1 parent 1abd8fb
commit 891a42c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/ci-code-review-rust.yml b/.github/workflows/ci-code-review-rust.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.70.0
           profile: minimal
           components: rustc
 

diff --git a/justfile b/justfile
@@ -10,7 +10,7 @@ test TEST_NAME:
     cargo test-sbf --features enable-gpl --  {{ TEST_NAME }}
 
 test-all:
-    (cd ./programs/openbook-v2 && RUST_LOG=ERROR cargo test-sbf --features enable-gpl)
+    (cd ./programs/openbook-v2 && RUST_LOG=ERROR cargo +1.70.0 test-sbf --features enable-gpl)
 
 test-dev:
     (find programs) | entr -s 'just test-all'

diff --git a/programs/openbook-v2/src/lib.rs b/programs/openbook-v2/src/lib.rs
@@ -1,6 +1,9 @@
 //! A central-limit order book (CLOB) program that targets the Sealevel runtime.
 
-use anchor_lang::prelude::{*, borsh::{BorshDeserialize, BorshSerialize}};
+use anchor_lang::prelude::{
+    borsh::{BorshDeserialize, BorshSerialize},
+    *,
+};
 
 declare_id!("opnbkNkqux64GppQhwbyEVc3axhssFhVYuwar8rDHCu");
 
@@ -21,10 +24,10 @@ pub mod types;
 pub mod instructions;
 
 use accounts_ix::*;
+use accounts_ix::{StubOracleCreate, StubOracleSet};
 use error::*;
 use state::{OracleConfigParams, Order, OrderParams, PlaceOrderType, SelfTradeBehavior, Side};
 use std::cmp;
-use accounts_ix::{StubOracleCreate, StubOracleSet};
 
 #[cfg(all(not(feature = "no-entrypoint"), not(feature = "enable-gpl")))]
 compile_error!("compiling the program entrypoint without 'enable-gpl' makes no sense, enable it or use the 'cpi' or 'client' features");
@@ -548,7 +551,7 @@ pub mod openbook_v2 {
     }
 }
 
-#[derive(AnchorSerialize, AnchorDeserialize, Debug, Copy, Clone)] 
+#[derive(AnchorSerialize, AnchorDeserialize, Debug, Copy, Clone)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct PlaceOrderArgs {
     pub side: Side,

diff --git a/programs/openbook-v2/tests/program_test/client.rs b/programs/openbook-v2/tests/program_test/client.rs
@@ -2,7 +2,6 @@
 
 use anchor_lang::prelude::*;
 use anchor_spl::token::Token;
-use fixed::types::I80F48;
 use solana_program::instruction::Instruction;
 use solana_program_test::BanksClientError;
 use solana_sdk::instruction;
@@ -997,9 +996,7 @@ impl ClientInstruction for StubOracleSetInstruction {
         _loader: impl ClientAccountLoader + 'async_trait,
     ) -> (Self::Accounts, Instruction) {
         let program_id = openbook_v2::id();
-        let instruction = Self::Instruction {
-            price: I80F48::from_num(self.price),
-        };
+        let instruction = Self::Instruction { price: self.price };
 
         let oracle = Pubkey::find_program_address(
             &[
@@ -1040,9 +1037,7 @@ impl ClientInstruction for StubOracleCreate {
         _loader: impl ClientAccountLoader + 'async_trait,
     ) -> (Self::Accounts, Instruction) {
         let program_id = openbook_v2::id();
-        let instruction = Self::Instruction {
-            price: I80F48::from_num(1.0),
-        };
+        let instruction = Self::Instruction { price: 1.0 };
 
         let oracle = Pubkey::find_program_address(
             &[

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.72.0"
+channel = "1.70.0"