Merge pull request #8 from askibin/custom

Rename test oracle to custom

Author: askibin

app/src/client.ts

@@ -132,7 +132,10 @@ export class PerpetualsClient {
     return (await this.getCustody(poolName, tokenMint)).oracle.oracleAccount;
   };
 
-  getCustodyTestOracleAccountKey = (poolName: string, tokenMint: PublicKey) => {
+  getCustodyCustomOracleAccountKey = (
+    poolName: string,
+    tokenMint: PublicKey
+  ) => {
     return this.findProgramAddress("oracle_account", [
       this.getPoolKey(poolName),
       tokenMint,

programs/perpetuals/src/instructions.rs

@@ -6,13 +6,13 @@ pub mod remove_custody;
 pub mod remove_pool;
 pub mod set_admin_signers;
 pub mod set_custody_config;
+pub mod set_custom_oracle_price;
 pub mod set_permissions;
 pub mod upgrade_custody;
 pub mod withdraw_fees;
 pub mod withdraw_sol_fees;
 
 // test instructions
-pub mod set_test_oracle_price;
 pub mod set_test_time;
 pub mod test_init;
 
@@ -45,7 +45,7 @@ pub use {
     get_liquidation_state::*, get_lp_token_price::*, get_oracle_price::*, get_pnl::*,
     get_remove_liquidity_amount_and_fee::*, get_swap_amount_and_fees::*, init::*, liquidate::*,
     open_position::*, remove_collateral::*, remove_custody::*, remove_liquidity::*, remove_pool::*,
-    set_admin_signers::*, set_custody_config::*, set_permissions::*, set_test_oracle_price::*,
+    set_admin_signers::*, set_custody_config::*, set_custom_oracle_price::*, set_permissions::*,
     set_test_time::*, swap::*, test_init::*, upgrade_custody::*, withdraw_fees::*,
     withdraw_sol_fees::*,
 };

…rc/instructions/set_test_oracle_price.rs …/instructions/set_custom_oracle_price.rsprograms/perpetuals/src/instructions/set_test_oracle_price.rs renamed to programs/perpetuals/src/instructions/set_custom_oracle_price.rs programs/perpetuals/src/instructions/set_test_oracle_price.rs renamed to programs/perpetuals/src/instructions/set_custom_oracle_price.rs

@@ -1,18 +1,18 @@
-//! SetTestOraclePrice instruction handler
+//! SetCustomOraclePrice instruction handler
 
 use {
     crate::state::{
         custody::Custody,
         multisig::{AdminInstruction, Multisig},
-        oracle::TestOracle,
+        oracle::CustomOracle,
         perpetuals::Perpetuals,
         pool::Pool,
     },
     anchor_lang::prelude::*,
 };
 
 #[derive(Accounts)]
-pub struct SetTestOraclePrice<'info> {
+pub struct SetCustomOraclePrice<'info> {
     #[account(mut)]
     pub admin: Signer<'info>,
 
@@ -47,37 +47,37 @@ pub struct SetTestOraclePrice<'info> {
     #[account(
         init_if_needed,
         payer = admin,
-        space = TestOracle::LEN,
+        space = CustomOracle::LEN,
         //constraint = oracle_account.key() == custody.oracle.oracle_account,
         seeds = [b"oracle_account",
                  pool.key().as_ref(),
                  custody.mint.as_ref()],
         bump
     )]
-    pub oracle_account: Box<Account<'info, TestOracle>>,
+    pub oracle_account: Box<Account<'info, CustomOracle>>,
 
     system_program: Program<'info, System>,
 }
 
 #[derive(AnchorSerialize, AnchorDeserialize, Copy, Clone)]
-pub struct SetTestOraclePriceParams {
+pub struct SetCustomOraclePriceParams {
     pub price: u64,
     pub expo: i32,
     pub conf: u64,
     pub publish_time: i64,
 }
 
-pub fn set_test_oracle_price<'info>(
-    ctx: Context<'_, '_, '_, 'info, SetTestOraclePrice<'info>>,
-    params: &SetTestOraclePriceParams,
+pub fn set_custom_oracle_price<'info>(
+    ctx: Context<'_, '_, '_, 'info, SetCustomOraclePrice<'info>>,
+    params: &SetCustomOraclePriceParams,
 ) -> Result<u8> {
     // validate signatures
     let mut multisig = ctx.accounts.multisig.load_mut()?;
 
     let signatures_left = multisig.sign_multisig(
         &ctx.accounts.admin,
         &Multisig::get_account_infos(&ctx)[1..],
-        &Multisig::get_instruction_data(AdminInstruction::SetTestOraclePrice, params)?,
+        &Multisig::get_instruction_data(AdminInstruction::SetCustomOraclePrice, params)?,
     )?;
     if signatures_left > 0 {
         msg!(

programs/perpetuals/src/lib.rs

@@ -105,19 +105,19 @@ pub mod perpetuals {
         instructions::upgrade_custody(ctx, &params)
     }
 
+    pub fn set_custom_oracle_price<'info>(
+        ctx: Context<'_, '_, '_, 'info, SetCustomOraclePrice<'info>>,
+        params: SetCustomOraclePriceParams,
+    ) -> Result<u8> {
+        instructions::set_custom_oracle_price(ctx, &params)
+    }
+
     // test instructions
 
     pub fn test_init(ctx: Context<TestInit>, params: TestInitParams) -> Result<()> {
         instructions::test_init(ctx, &params)
     }
 
-    pub fn set_test_oracle_price<'info>(
-        ctx: Context<'_, '_, '_, 'info, SetTestOraclePrice<'info>>,
-        params: SetTestOraclePriceParams,
-    ) -> Result<u8> {
-        instructions::set_test_oracle_price(ctx, &params)
-    }
-
     pub fn set_test_time<'info>(
         ctx: Context<'_, '_, '_, 'info, SetTestTime<'info>>,
         params: SetTestTimeParams,

programs/perpetuals/src/state/multisig.rs

@@ -33,7 +33,7 @@ pub enum AdminInstruction {
     SetBorrowRate,
     WithdrawFees,
     WithdrawSolFees,
-    SetTestOraclePrice,
+    SetCustomOraclePrice,
     SetTestTime,
     UpgradeCustody,
 }

programs/perpetuals/src/state/oracle.rs

@@ -13,7 +13,7 @@ const ORACLE_MAX_PRICE: u64 = (1 << 28) - 1;
 #[derive(Copy, Clone, PartialEq, AnchorSerialize, AnchorDeserialize, Debug)]
 pub enum OracleType {
     None,
-    Test,
+    Custom,
     Pyth,
 }
 
@@ -39,15 +39,15 @@ pub struct OracleParams {
 
 #[account]
 #[derive(Default, Debug)]
-pub struct TestOracle {
+pub struct CustomOracle {
     pub price: u64,
     pub expo: i32,
     pub conf: u64,
     pub publish_time: i64,
 }
 
-impl TestOracle {
-    pub const LEN: usize = 8 + std::mem::size_of::<TestOracle>();
+impl CustomOracle {
+    pub const LEN: usize = 8 + std::mem::size_of::<CustomOracle>();
 }
 
 impl PartialOrd for OraclePrice {
@@ -89,7 +89,7 @@ impl OraclePrice {
         use_ema: bool,
     ) -> Result<Self> {
         match oracle_params.oracle_type {
-            OracleType::Test => Self::get_test_price(
+            OracleType::Custom => Self::get_custom_price(
                 oracle_account,
                 oracle_params.max_price_error,
                 oracle_params.max_price_age_sec,
@@ -226,22 +226,22 @@ impl OraclePrice {
     }
 
     // private helpers
-    fn get_test_price(
-        test_price_info: &AccountInfo,
+    fn get_custom_price(
+        custom_price_info: &AccountInfo,
         max_price_error: u64,
         max_price_age_sec: u32,
         current_time: i64,
     ) -> Result<OraclePrice> {
         require!(
-            !Perpetuals::is_empty_account(test_price_info)?,
+            !Perpetuals::is_empty_account(custom_price_info)?,
             PerpetualsError::InvalidOracleAccount
         );
 
-        let oracle_acc = Account::<TestOracle>::try_from(test_price_info)?;
+        let oracle_acc = Account::<CustomOracle>::try_from(custom_price_info)?;
 
         let last_update_age_sec = math::checked_sub(current_time, oracle_acc.publish_time)?;
         if last_update_age_sec > max_price_age_sec as i64 {
-            msg!("Error: Test oracle price is stale");
+            msg!("Error: Custom oracle price is stale");
             return err!(PerpetualsError::StaleOraclePrice);
         }
 
@@ -251,7 +251,7 @@ impl OraclePrice {
                 oracle_acc.price as u128,
             )? > max_price_error as u128
         {
-            msg!("Error: Test oracle price is out of bounds");
+            msg!("Error: Custom oracle price is out of bounds");
             return err!(PerpetualsError::InvalidOraclePrice);
         }
 

programs/perpetuals/src/state/pool.rs

@@ -1046,7 +1046,7 @@ mod test {
 
         let oracle = OracleParams {
             oracle_account: Pubkey::default(),
-            oracle_type: OracleType::Test,
+            oracle_type: OracleType::Custom,
             max_price_error: 100,
             max_price_age_sec: 1,
         };

programs/perpetuals/tests/anchor/basic.ts

@@ -133,7 +133,7 @@ describe("perpetuals", () => {
     oracleConfig = {
       maxPriceError: new BN(10000),
       maxPriceAgeSec: 60,
-      oracleType: { test: {} },
+      oracleType: { custom: {} },
       oracleAccount: tc.custodies[0].oracleAccount,
     };
     pricing = {
@@ -224,7 +224,7 @@ describe("perpetuals", () => {
       isVirtual,
       oracle: {
         oracleAccount: tc.custodies[0].oracleAccount,
-        oracleType: { test: {} },
+        oracleType: { custom: {} },
         maxPriceError: "10000",
         maxPriceAgeSec: 60,
       },
@@ -385,11 +385,11 @@ describe("perpetuals", () => {
     expect(JSON.stringify(token)).to.equal(JSON.stringify(tokenExpected));
   });
 
-  it("setTestOraclePrice", async () => {
-    await tc.setTestOraclePrice(123, tc.custodies[0]);
-    await tc.setTestOraclePrice(200, tc.custodies[1]);
+  it("setCustomOraclePrice", async () => {
+    await tc.setCustomOraclePrice(123, tc.custodies[0]);
+    await tc.setCustomOraclePrice(200, tc.custodies[1]);
 
-    let oracle = await tc.program.account.testOracle.fetch(
+    let oracle = await tc.program.account.customOracle.fetch(
       tc.custodies[0].oracleAccount
     );
     let oracleExpected = {
@@ -539,7 +539,7 @@ describe("perpetuals", () => {
       tc.users[0].positionAccountsLong[0],
       tc.custodies[0]
     );
-    await tc.setTestOraclePrice(80, tc.custodies[0]);
+    await tc.setCustomOraclePrice(80, tc.custodies[0]);
     await tc.liquidate(
       tc.users[0],
       tc.users[0].tokenAccounts[0],

programs/perpetuals/tests/anchor/test_client.ts

@@ -665,14 +665,14 @@ export class TestClient {
     }
   };
 
-  setTestOraclePrice = async (price: number, custody) => {
+  setCustomOraclePrice = async (price: number, custody) => {
     let multisig = await this.program.account.multisig.fetch(
       this.multisig.publicKey
     );
     for (let i = 0; i < multisig.minSignatures; ++i) {
       try {
         await this.program.methods
-          .setTestOraclePrice({
+          .setCustomOraclePrice({
             price: new BN(price * 1000),
             expo: -3,
             conf: new BN(0),

programs/perpetuals/tests/native/instructions/mod.rs

@@ -8,12 +8,12 @@ pub mod test_liquidate;
 pub mod test_open_position;
 pub mod test_remove_liquidity;
 pub mod test_set_custody_config;
-pub mod test_set_test_oracle_price;
+pub mod test_set_custom_oracle_price;
 pub mod test_swap;
 
 pub use {
     test_add_custody::*, test_add_liquidity::*, test_add_pool::*, test_close_position::*,
     test_get_lp_token_price::*, test_init::*, test_liquidate::*, test_open_position::*,
-    test_remove_liquidity::*, test_set_custody_config::*, test_set_test_oracle_price::*,
+    test_remove_liquidity::*, test_set_custody_config::*, test_set_custom_oracle_price::*,
     test_swap::*,
 };