more import style changes

Author: majabbour

program/rust/src/lib.rs

@@ -1,13 +1,19 @@
-pub mod c_oracle_header;
+mod c_oracle_header;
 mod error;
 mod log;
 mod rust_oracle;
 mod time_machine_types;
 
-use ::std::mem::size_of;
+use crate::c_oracle_header::{
+    cmd_hdr, command_t_e_cmd_agg_price, command_t_e_cmd_upd_account_version,
+    command_t_e_cmd_upd_price, command_t_e_cmd_upd_price_no_fail_on_error, PC_VERSION,
+    SUCCESSFULLY_UPDATED_AGGREGATE,
+};
 use crate::log::{post_log, pre_log};
+use crate::rust_oracle::{update_price, update_version};
+use ::std::mem::size_of;
 use borsh::{BorshDeserialize, BorshSerialize};
-use solana_program::entrypoint::deserialize;
+use solana_program::{custom_heap_default, custom_panic_default, entrypoint::deserialize};
 
 //Below is a high lever description of the rust/c setup.
 
@@ -48,29 +54,28 @@ pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
         _ => {}
     }
 
-    let cmd_hdr_size = size_of::<c_oracle_header::cmd_hdr>();
+    let cmd_hdr_size = size_of::<cmd_hdr>();
     if instruction_data.len() < cmd_hdr_size {
         panic!("insufficient data, could not parse instruction");
     }
 
-    let cmd_data =
-        c_oracle_header::cmd_hdr::try_from_slice(&instruction_data[..cmd_hdr_size]).unwrap();
+    let cmd_data = cmd_hdr::try_from_slice(&instruction_data[..cmd_hdr_size]).unwrap();
 
-    if cmd_data.ver_ != c_oracle_header::PC_VERSION {
+    if cmd_data.ver_ != PC_VERSION {
         //FIXME: I am not sure what's best to do here (this is copied from C)
         // it seems to me like we should not break when version numbers change
         //instead we should log a message that asks users to call update_version
         panic!("incorrect version numbers");
     }
 
     let c_ret_val = match cmd_data.cmd_ as u32 {
-        c_oracle_header::command_t_e_cmd_upd_price
-        | c_oracle_header::command_t_e_cmd_upd_price_no_fail_on_error
-        | c_oracle_header::command_t_e_cmd_agg_price => {
-            rust_oracle::update_price(program_id, &accounts, &instruction_data, input)
+        command_t_e_cmd_upd_price
+        | command_t_e_cmd_upd_price_no_fail_on_error
+        | command_t_e_cmd_agg_price => {
+            update_price(program_id, &accounts, &instruction_data, input)
         }
-        c_oracle_header::command_t_e_cmd_upd_account_version => {
-            rust_oracle::update_version(program_id, &accounts, &instruction_data)
+        command_t_e_cmd_upd_account_version => {
+            update_version(program_id, &accounts, &instruction_data)
         }
         _ => unsafe { return c_entrypoint(input) },
     };
@@ -80,13 +85,13 @@ pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
         _ => {}
     }
 
-    if c_ret_val == c_oracle_header::SUCCESSFULLY_UPDATED_AGGREGATE {
+    if c_ret_val == SUCCESSFULLY_UPDATED_AGGREGATE {
         //0 is the SUCCESS value for solana
         return 0;
     } else {
         return c_ret_val;
     }
 }
 
-solana_program::custom_heap_default!();
-solana_program::custom_panic_default!();
+custom_heap_default!();
+custom_panic_default!();