refactor loaders into utils

program/src/claim.rs

@@ -4,7 +4,7 @@ use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
 };
 
-use crate::utils::AccountDeserialize;
+use ore_utils::{loaders::*, AccountDeserialize};
 
 /// Claim distributes claimable ORE from the treasury to a miner.
 pub fn process_claim<'a, 'info>(accounts: &'a [AccountInfo<'info>], data: &[u8]) -> ProgramResult {

program/src/close.rs

@@ -4,7 +4,7 @@ use solana_program::{
     system_program,
 };
 
-use crate::utils::AccountDeserialize;
+use ore_utils::{loaders::*, AccountDeserialize};
 
 /// Close closes a proof account and returns the rent to the owner.
 pub fn process_close<'a, 'info>(accounts: &'a [AccountInfo<'info>], _data: &[u8]) -> ProgramResult {

program/src/initialize.rs

@@ -3,10 +3,9 @@ use std::mem::size_of;
 use ore_api::{
     consts::*,
     instruction::*,
-    loaders::*,
     state::{Bus, Config, Treasury},
 };
-use ore_utils::spl::create_ata;
+use ore_utils::{create_pda, loaders::*, spl::create_ata, AccountDeserialize, Discriminator};
 use solana_program::{
     account_info::AccountInfo,
     entrypoint::ProgramResult,
@@ -16,8 +15,6 @@ use solana_program::{
 };
 use spl_token::state::Mint;
 
-use crate::utils::{create_pda, AccountDeserialize, Discriminator};
-
 /// Initialize sets up the ORE program to begin mining.
 pub fn process_initialize<'a, 'info>(
     accounts: &'a [AccountInfo<'info>],

program/src/lib.rs

@@ -24,8 +24,6 @@ use solana_program::{
     pubkey::Pubkey,
 };
 
-pub(crate) use ore_utils as utils;
-
 #[cfg(not(feature = "no-entrypoint"))]
 solana_program::entrypoint!(process_instruction);
 

program/src/mine.rs

@@ -24,7 +24,7 @@ use solana_program::{
     sysvar::{self, Sysvar},
 };
 
-use crate::utils::AccountDeserialize;
+use ore_utils::{loaders::*, AccountDeserialize};
 
 /// Mine validates hashes and increments a miner's collectable balance.
 pub fn process_mine<'a, 'info>(accounts: &'a [AccountInfo<'info>], data: &[u8]) -> ProgramResult {

program/src/open.rs

@@ -1,6 +1,6 @@
 use std::mem::size_of;
 
-use ore_api::{consts::*, instruction::OpenArgs, loaders::*, state::Proof};
+use ore_api::{consts::*, instruction::OpenArgs, state::Proof};
 use solana_program::{
     account_info::AccountInfo,
     clock::Clock,
@@ -12,7 +12,7 @@ use solana_program::{
     sysvar::{self, Sysvar},
 };
 
-use crate::utils::{create_pda, AccountDeserialize, Discriminator};
+use ore_utils::{create_pda, loaders::*, AccountDeserialize, Discriminator};
 
 /// Open creates a new proof account to track a miner's state.
 pub fn process_open<'a, 'info>(accounts: &'a [AccountInfo<'info>], data: &[u8]) -> ProgramResult {

program/src/reset.rs

@@ -10,7 +10,7 @@ use solana_program::{
 };
 use spl_token::state::Mint;
 
-use crate::utils::AccountDeserialize;
+use ore_utils::{loaders::*, AccountDeserialize};
 
 /// Reset tops up the bus balances, updates the base reward rate, and sets up the ORE program for the next epoch.
 pub fn process_reset<'a, 'info>(accounts: &'a [AccountInfo<'info>], _data: &[u8]) -> ProgramResult {

program/src/stake.rs

@@ -1,12 +1,10 @@
 use ore_api::{consts::*, instruction::StakeArgs, loaders::*, state::Proof};
-use ore_utils::spl::transfer;
+use ore_utils::{loaders::*, spl::transfer, AccountDeserialize};
 use solana_program::{
     account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult,
     program_error::ProgramError, sysvar::Sysvar,
 };
 
-use crate::utils::AccountDeserialize;
-
 /// Stake deposits ORE into a proof account to earn multiplier.
 pub fn process_stake<'a, 'info>(accounts: &'a [AccountInfo<'info>], data: &[u8]) -> ProgramResult {
     // Parse args.

program/src/update.rs

@@ -1,10 +1,9 @@
 use ore_api::{loaders::*, state::Proof};
+use ore_utils::{loaders::*, AccountDeserialize};
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
 };
 
-use crate::utils::AccountDeserialize;
-
 /// Update changes the miner authority on a proof account.
 pub fn process_update<'a, 'info>(
     accounts: &'a [AccountInfo<'info>],

program/src/upgrade.rs

@@ -1,5 +1,5 @@
-use ore_api::{consts::*, error::OreError, instruction::StakeArgs, loaders::*};
-use ore_utils::spl::mint_to_signed;
+use ore_api::{consts::*, error::OreError, instruction::StakeArgs};
+use ore_utils::{loaders::*, spl::mint_to_signed};
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
     program_pack::Pack,