merging formatting issues

Author: majabbour

program/rust/build.rs

@@ -1,7 +1,6 @@
 mod build_utils;
 use bindgen::Builder;
 
-
 fn main() {
     println!("cargo:rustc-link-search=../c/target");
 
@@ -14,7 +13,6 @@ fn main() {
     parser.register_traits("pc_price_info", borsh_derives.to_vec());
     parser.register_traits("cmd_upd_price", borsh_derives.to_vec());
 
-
     //generate and write bindings
     let bindings = Builder::default()
         .header("./src/bindings.h")

program/rust/src/lib.rs

@@ -1,14 +1,13 @@
 pub mod c_oracle_header;
-mod rust_oracle;
-mod time_machine_types;
 mod error;
 mod log;
+mod rust_oracle;
+mod time_machine_types;
 
 use crate::log::{post_log, pre_log};
-use solana_program::entrypoint::deserialize;
 use borsh::{BorshDeserialize, BorshSerialize};
 use solana_program::entrypoint::deserialize;
-
+use solana_program::entrypoint::deserialize;
 
 //Below is a high lever description of the rust/c setup.
 
@@ -44,7 +43,7 @@ pub extern "C" fn c_entrypoint(input: *mut u8) -> u64 {
 pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
     let (_program_id, accounts, instruction_data) = unsafe { deserialize(input) };
 
-    match pre_log(&accounts,instruction_data) {
+    match pre_log(&accounts, instruction_data) {
         Err(error) => return error.into(),
         _ => {}
     }
@@ -74,7 +73,7 @@ pub extern "C" fn entrypoint(input: *mut u8) -> u64 {
             rust_oracle::update_version(program_id, accounts, instruction_data)
         }
         _ => unsafe { return c_entrypoint(input) },
-    }
+    };
 
     match post_log(c_ret_val, &accounts) {
         Err(error) => return error.into(),

program/rust/src/log.rs

@@ -6,7 +6,7 @@ use solana_program::entrypoint::ProgramResult;
 use solana_program::msg;
 use std::mem::size_of;
 
-pub fn pre_log(accounts : &[AccountInfo], instruction_data: &[u8]) -> ProgramResult {
+pub fn pre_log(accounts: &[AccountInfo], instruction_data: &[u8]) -> ProgramResult {
     msg!("Pyth oracle contract");
 
     let instruction_header: cmd_hdr = cmd_hdr::try_from_slice(&instruction_data[..8])?;
@@ -15,7 +15,7 @@ pub fn pre_log(accounts : &[AccountInfo], instruction_data: &[u8]) -> ProgramRes
         .try_into()
         .map_err(|_| OracleError::Generic)?;
     match instruction_id {
-        command_t_e_cmd_upd_price | command_t_e_cmd_agg_price=> {
+        command_t_e_cmd_upd_price | command_t_e_cmd_agg_price => {
             let instruction: cmd_upd_price = cmd_upd_price::try_from_slice(instruction_data)?;
             msg!(
                 "UpdatePrice: publisher={:}, price_account={:}, price={:}, conf={:}, status={:}, slot={:}",
@@ -29,7 +29,7 @@ pub fn pre_log(accounts : &[AccountInfo], instruction_data: &[u8]) -> ProgramRes
                 instruction.pub_slot_
             );
         }
-        command_t_e_cmd_upd_price_no_fail_on_error=> {
+        command_t_e_cmd_upd_price_no_fail_on_error => {
             let instruction: cmd_upd_price = cmd_upd_price::try_from_slice(instruction_data)?;
             msg!(
                 "UpdatePriceNoFailOnError: publisher={:}, price_account={:}, price={:}, conf={:}, status={:}, slot={:}",
@@ -93,8 +93,7 @@ pub fn post_log(c_ret_val: u64, accounts: &[AccountInfo]) -> ProgramResult {
         )?;
         msg!(
             "UpdateAggregate : price_account={:}, price={:}, conf={:}, status={:}, slot={:}",
-            accounts.get(1)
-            .ok_or(OracleError::Generic)?.key,
+            accounts.get(1).ok_or(OracleError::Generic)?.key,
             aggregate_price_info.price_,
             aggregate_price_info.conf_,
             aggregate_price_info.status_,