precommit

Author: 0xripleys

pyth-sdk-solana/src/state.rs

@@ -16,7 +16,8 @@ use pyth_sdk::{
     PriceIdentifier,
     UnixTimestamp,
 };
-use solana_program::{pubkey::Pubkey, clock::Clock};
+use solana_program::clock::Clock;
+use solana_program::pubkey::Pubkey;
 use std::mem::size_of;
 
 pub use pyth_sdk::{
@@ -354,28 +355,27 @@ impl PriceAccount {
         }
     }
 
-    /// Get the last valid price as long as it was updated within `slot_threshold` slots of the current slot.
-    pub fn get_price_no_older_than(
-        &self,
-        clock: &Clock,
-        slot_threshold: u64
-    ) -> Option<Price> {
-        if self.agg.status == PriceStatus::Trading && self.agg.pub_slot >= clock.slot - slot_threshold {
+    /// Get the last valid price as long as it was updated within `slot_threshold` slots of the
+    /// current slot.
+    pub fn get_price_no_older_than(&self, clock: &Clock, slot_threshold: u64) -> Option<Price> {
+        if self.agg.status == PriceStatus::Trading
+            && self.agg.pub_slot >= clock.slot - slot_threshold
+        {
             return Some(Price {
                 conf:         self.agg.conf,
                 expo:         self.expo,
                 price:        self.agg.price,
                 publish_time: self.timestamp,
-            })
+            });
         }
-        
+
         if self.prev_slot >= clock.slot - slot_threshold {
             return Some(Price {
                 conf:         self.prev_conf,
                 expo:         self.expo,
                 price:        self.prev_price,
                 publish_time: self.prev_timestamp,
-            })
+            });
         }
 
         None
@@ -507,7 +507,8 @@ mod test {
         Price,
         PriceFeed,
     };
-    use solana_program::{pubkey::Pubkey, clock::Clock};
+    use solana_program::clock::Clock;
+    use solana_program::pubkey::Pubkey;
 
     use super::{
         PriceAccount,
@@ -639,9 +640,9 @@ mod test {
         assert_eq!(
             price_account.get_price_no_older_than(&clock, 4),
             Some(Price {
-                conf: 20,
-                expo: 5,
-                price: 10,
+                conf:         20,
+                expo:         5,
+                price:        10,
                 publish_time: 200,
             })
         );
@@ -674,9 +675,9 @@ mod test {
         assert_eq!(
             price_account.get_price_no_older_than(&clock, 4),
             Some(Price {
-                conf: 70,
-                expo: 5,
-                price: 60,
+                conf:         70,
+                expo:         5,
+                price:        60,
                 publish_time: 100,
             })
         );
@@ -707,10 +708,7 @@ mod test {
         };
 
         // current price is unknown, prev price is too stale
-        assert_eq!(
-            price_account.get_price_no_older_than(&clock, 3),
-            None
-        );
+        assert_eq!(price_account.get_price_no_older_than(&clock, 3), None);
     }
 
     #[test]
@@ -737,9 +735,6 @@ mod test {
             ..Default::default()
         };
 
-        assert_eq!(
-            price_account.get_price_no_older_than(&clock, 1),
-            None
-        );
+        assert_eq!(price_account.get_price_no_older_than(&clock, 1), None);
     }
 }