Format

Author: Guillermo Bescos

.github/workflows/check-fomatting.yml

@@ -0,0 +1,19 @@
+name: Check Formatting
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: nightly
+        components: rustfmt
+    - uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-added-large-files
+- repo: local
+  hooks:
+    - id: cargo-fmt-nightly
+      name: Cargo Fmt Nightly
+      language: "rust"
+      entry: cargo +nightly fmt
+      pass_filenames: false

Cargo.toml

@@ -0,0 +1,4 @@
+[workspace]
+members = [
+  "program/rust"
+]

program/rust/.gitignore

@@ -0,0 +1 @@
+bindings.rs

program/rust/build_utils.rs

@@ -24,7 +24,8 @@ impl<'a> DeriveAdderParserCallback<'a> {
 }
 
 //this is required to implement the callback trait
-impl UnwindSafe for DeriveAdderParserCallback<'_> {}
+impl UnwindSafe for DeriveAdderParserCallback<'_> {
+}
 
 impl ParseCallbacks for DeriveAdderParserCallback<'_> {
     fn add_derives(&self, _name: &str) -> Vec<String> {

program/rust/src/c_oracle_header.rs

@@ -5,7 +5,10 @@
 #![allow(unused_variables)]
 #![allow(dead_code)]
 //All the custom trait imports should go here
-use borsh::{BorshDeserialize, BorshSerialize};
+use borsh::{
+    BorshDeserialize,
+    BorshSerialize,
+};
 //bindings.rs is generated by build.rs to include
 //things defined in bindings.h
 include!("../bindings.rs");

program/rust/src/error.rs

@@ -10,13 +10,13 @@ pub type OracleResult = Result<u64, ProgramError>;
 pub enum OracleError {
     /// Generic catch all error
     #[error("Generic")]
-    Generic = 600,
+    Generic             = 600,
     /// integer casting error
     #[error("IntegerCastingError")]
     IntegerCastingError = 601,
     /// c_entrypoint returned an unexpected value
     #[error("UnknownCError")]
-    UnknownCError = 602,
+    UnknownCError       = 602,
 }
 
 impl From<OracleError> for ProgramError {

program/rust/src/lib.rs

@@ -6,11 +6,21 @@ mod rust_oracle;
 mod time_machine_types;
 
 use crate::c_oracle_header::SUCCESSFULLY_UPDATED_AGGREGATE;
-use crate::error::{OracleError, OracleResult};
-use crate::log::{post_log, pre_log};
+use crate::error::{
+    OracleError,
+    OracleResult,
+};
+use crate::log::{
+    post_log,
+    pre_log,
+};
 use processor::process_instruction;
+use solana_program::entrypoint::deserialize;
 use solana_program::program_error::ProgramError;
-use solana_program::{custom_heap_default, custom_panic_default, entrypoint::deserialize};
+use solana_program::{
+    custom_heap_default,
+    custom_panic_default,
+};
 
 //Below is a high lever description of the rust/c setup.
 

program/rust/src/processor.rs

@@ -1,10 +1,20 @@
 use crate::c_entrypoint_wrapper;
 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,
+    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,
+};
+use crate::error::{
+    OracleError,
+    OracleResult,
+};
+use crate::rust_oracle::{
+    update_price,
+    update_version,
 };
-use crate::error::{OracleError, OracleResult};
-use crate::rust_oracle::{update_price, update_version};
 use ::std::mem::size_of;
 use borsh::BorshDeserialize;
 use solana_program::pubkey::Pubkey;

program/rust/src/rust_oracle.rs

@@ -10,8 +10,8 @@ pub fn update_price(
     instruction_data: &[u8],
     input: *mut u8,
 ) -> OracleResult {
-    //For now, we did not change the behavior of this. this is just to show the proposed structure of the
-    //program
+    //For now, we did not change the behavior of this. this is just to show the proposed structure
+    // of the program
     c_entrypoint_wrapper(input)
 }
 /// has version number/ account type dependant logic to make sure the given account is compatible