instruction macro and simplification

program/src/claim.rs

@@ -1,4 +1,4 @@
-use ore_api::{consts::*, error::OreError, instruction::ClaimArgs, loaders::*, state::Proof};
+use ore_api::{consts::*, error::OreError, instruction::*, loaders::*, state::Proof};
 use ore_utils::*;
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
@@ -7,7 +7,7 @@ use solana_program::{
 /// Claim distributes claimable ORE from the treasury to a miner.
 pub fn process_claim(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args.
-    let args = ClaimArgs::try_from_bytes(data)?;
+    let args = Claim::try_from_bytes(data)?;
     let amount = u64::from_le_bytes(args.amount);
 
     // Load accounts.

program/src/initialize.rs

@@ -7,18 +7,15 @@ use ore_api::{
 };
 use ore_utils::*;
 use solana_program::{
-    account_info::AccountInfo,
-    entrypoint::ProgramResult,
-    program_error::ProgramError,
-    program_pack::Pack,
-    system_program, {self, sysvar},
+    self, account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
+    program_pack::Pack, system_program, sysvar,
 };
 use spl_token::state::Mint;
 
 /// Initialize sets up the ORE program to begin mining.
 pub fn process_initialize(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args.
-    let args = InitializeArgs::try_from_bytes(data)?;
+    let args = Initialize::try_from_bytes(data)?;
 
     // Load accounts.
     let [signer, bus_0_info, bus_1_info, bus_2_info, bus_3_info, bus_4_info, bus_5_info, bus_6_info, bus_7_info, config_info, metadata_info, mint_info, treasury_info, treasury_tokens_info, system_program, token_program, associated_token_program, metadata_program, rent_sysvar] =

program/src/mine.rs

@@ -5,7 +5,7 @@ use ore_api::{
     consts::*,
     error::OreError,
     event::MineEvent,
-    instruction::MineArgs,
+    instruction::Mine,
     loaders::*,
     state::{Bus, Config, Proof},
 };
@@ -28,7 +28,7 @@ use solana_program::{
 /// Mine validates hashes and increments a miner's collectable balance.
 pub fn process_mine(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args.
-    let args = MineArgs::try_from_bytes(data)?;
+    let args = Mine::try_from_bytes(data)?;
 
     // Load accounts.
     let [signer, bus_info, config_info, proof_info, instructions_sysvar, slot_hashes_sysvar] =

program/src/open.rs

@@ -1,6 +1,6 @@
 use std::mem::size_of;
 
-use ore_api::{consts::*, instruction::OpenArgs, state::Proof};
+use ore_api::{consts::*, instruction::Open, state::Proof};
 use ore_utils::*;
 use solana_program::{
     account_info::AccountInfo,
@@ -16,7 +16,7 @@ use solana_program::{
 /// Open creates a new proof account to track a miner's state.
 pub fn process_open(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args.
-    let args = OpenArgs::try_from_bytes(data)?;
+    let args = Open::try_from_bytes(data)?;
 
     // Load accounts.
     let [signer, miner_info, payer_info, proof_info, system_program, slot_hashes_info] = accounts

program/src/stake.rs

@@ -1,4 +1,4 @@
-use ore_api::{consts::*, instruction::StakeArgs, loaders::*, state::Proof};
+use ore_api::{consts::*, instruction::Stake, loaders::*, state::Proof};
 use ore_utils::*;
 use solana_program::{
     account_info::AccountInfo, clock::Clock, entrypoint::ProgramResult,
@@ -8,7 +8,7 @@ use solana_program::{
 /// Stake deposits ORE into a proof account to earn multiplier.
 pub fn process_stake(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args.
-    let args = StakeArgs::try_from_bytes(data)?;
+    let args = Stake::try_from_bytes(data)?;
     let amount = u64::from_le_bytes(args.amount);
 
     // Load accounts.

program/src/upgrade.rs

@@ -1,4 +1,4 @@
-use ore_api::{consts::*, error::OreError, instruction::StakeArgs};
+use ore_api::{consts::*, error::OreError, instruction::Stake};
 use ore_utils::*;
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult, program_error::ProgramError,
@@ -9,7 +9,7 @@ use spl_token::state::Mint;
 /// Upgrade allows a user to migrate a v1 token to a v2 token at a 1:1 exchange rate.
 pub fn process_upgrade(accounts: &[AccountInfo<'_>], data: &[u8]) -> ProgramResult {
     // Parse args
-    let args = StakeArgs::try_from_bytes(data)?;
+    let args = Stake::try_from_bytes(data)?;
     let amount = u64::from_le_bytes(args.amount);
 
     // Load accounts