Move keystore module one level higher

Author: tompntn

integration-tests/agent_conf.toml

@@ -1,7 +1,7 @@
 [primary_network]
+key_store.root_path = "keystore"
 oracle.poll_interval_duration = "1s"
 oracle.oracle_account_key = "BujGr9ChcuaCJhxeFEvGvaCFTxSV1CUCSVHL1SVFpU4i"
 oracle.mapping_account_key = "BTJKZngp3vzeJiRmmT9PitQH4H29dhQZ1GNhxFfDi4kw"
 oracle.subscriber.account_key = "BujGr9ChcuaCJhxeFEvGvaCFTxSV1CUCSVHL1SVFpU4i"
-exporter.key_store.root_path = "keystore"
 exporter.transaction_monitor.poll_interval_duration = "1s"

src/agent/solana.rs

@@ -12,6 +12,10 @@ pub mod network {
                 store::global,
             },
             exporter,
+            key_store::{
+                self,
+                KeyStore,
+            },
             oracle,
         },
         anyhow::Result,
@@ -32,10 +36,12 @@ pub mod network {
     /// Configuration for a network
     #[derive(Clone, Serialize, Deserialize, Debug, Default)]
     pub struct Config {
+        /// Keystore
+        pub key_store: key_store::Config,
         /// Configuration for the Oracle reading data from this network
-        pub oracle:   oracle::Config,
+        pub oracle:    oracle::Config,
         /// Configuration for the Exporter publishing data to this network
-        pub exporter: exporter::Config,
+        pub exporter:  exporter::Config,
     }
 
     pub fn spawn_network(
@@ -44,6 +50,9 @@ pub mod network {
         global_store_update_tx: mpsc::Sender<global::Update>,
         logger: Logger,
     ) -> Result<Vec<JoinHandle<()>>> {
+        // Create the key store
+        let key_store = KeyStore::new(config.key_store.clone())?;
+
         // Spawn the Oracle
         let mut jhs = oracle::spawn_oracle(
             config.oracle.clone(),
@@ -52,9 +61,97 @@ pub mod network {
         );
 
         // Spawn the Exporter
-        let exporter_jhs = exporter::spawn_exporter(config.exporter, local_store_tx, logger)?;
+        let exporter_jhs =
+            exporter::spawn_exporter(config.exporter, key_store, local_store_tx, logger)?;
         jhs.extend(exporter_jhs);
 
         Ok(jhs)
     }
 }
+
+/// The key_store module is responsible for parsing the pythd key store.
+mod key_store {
+    use {
+        anyhow::{
+            anyhow,
+            Context,
+            Result,
+        },
+        serde::{
+            Deserialize,
+            Serialize,
+        },
+        solana_sdk::{
+            pubkey::Pubkey,
+            signature::Keypair,
+            signer::keypair,
+        },
+        std::{
+            fs,
+            path::{
+                Path,
+                PathBuf,
+            },
+            str::FromStr,
+        },
+    };
+
+
+    #[derive(Clone, Serialize, Deserialize, Debug)]
+    #[serde(default)]
+    pub struct Config {
+        /// Root directory of the KeyStore
+        pub root_path:            PathBuf,
+        /// Path to the keypair used to publish price updates, relative to the root
+        pub publish_keypair_path: PathBuf,
+        /// Path to the public key of the Oracle program, relative to the root
+        pub program_key_path:     PathBuf,
+        /// Path to the public key of the root mapping account, relative to the root
+        pub mapping_key_path:     PathBuf,
+    }
+
+    impl Default for Config {
+        fn default() -> Self {
+            Self {
+                root_path:            Default::default(),
+                publish_keypair_path: "publish_key_pair.json".into(),
+                program_key_path:     "program_key.json".into(),
+                mapping_key_path:     "mapping_key.json".into(),
+            }
+        }
+    }
+
+    pub struct KeyStore {
+        /// The keypair used to publish price updates
+        pub publish_keypair: Keypair,
+        /// Public key of the Oracle program
+        pub program_key:     Pubkey,
+        /// Public key of the root mapping account
+        pub mapping_key:     Pubkey,
+    }
+
+    impl KeyStore {
+        pub fn new(config: Config) -> Result<Self> {
+            Ok(KeyStore {
+                publish_keypair: keypair::read_keypair_file(
+                    config.root_path.join(config.publish_keypair_path),
+                )
+                .map_err(|e| anyhow!(e.to_string()))
+                .context("reading publish keypair")?,
+                program_key:     Self::pubkey_from_path(
+                    config.root_path.join(config.program_key_path),
+                )
+                .context("reading program key")?,
+                mapping_key:     Self::pubkey_from_path(
+                    config.root_path.join(config.mapping_key_path),
+                )
+                .context("reading mapping key")?,
+            })
+        }
+
+        fn pubkey_from_path(path: impl AsRef<Path>) -> Result<Pubkey> {
+            let contents = fs::read_to_string(path)?;
+            Pubkey::from_str(contents.trim()).map_err(|e| e.into())
+        }
+    }
+}

src/agent/solana/exporter.rs

@@ -1,9 +1,12 @@
 use {
     self::transaction_monitor::TransactionMonitor,
-    super::super::store::{
-        self,
-        local::PriceInfo,
-        PriceIdentifier,
+    super::{
+        super::store::{
+            self,
+            local::PriceInfo,
+            PriceIdentifier,
+        },
+        key_store,
     },
     anyhow::{
         anyhow,
@@ -130,6 +133,7 @@ impl Default for Config {
 
 pub fn spawn_exporter(
     config: Config,
+    key_store: KeyStore,
     local_store_tx: Sender<store::local::Message>,
     logger: Logger,
 ) -> Result<Vec<JoinHandle<()>>> {
@@ -154,7 +158,6 @@ pub fn spawn_exporter(
     let transaction_monitor_jh = tokio::spawn(async move { transaction_monitor.run().await });
 
     // Create and spawn the exporter
-    let key_store = KeyStore::new(config.key_store.clone())?;
     let mut exporter = Exporter::new(
         config,
         key_store,
@@ -629,90 +632,3 @@ mod transaction_monitor {
         }
     }
 }
-
-/// The key_store module is responsible for parsing the pythd key store.
-mod key_store {
-    use {
-        anyhow::{
-            anyhow,
-            Context,
-            Result,
-        },
-        serde::{
-            Deserialize,
-            Serialize,
-        },
-        solana_sdk::{
-            pubkey::Pubkey,
-            signature::Keypair,
-            signer::keypair,
-        },
-        std::{
-            fs,
-            path::{
-                Path,
-                PathBuf,
-            },
-            str::FromStr,
-        },
-    };
-
-
-    #[derive(Clone, Serialize, Deserialize, Debug)]
-    #[serde(default)]
-    pub struct Config {
-        /// Root directory of the KeyStore
-        pub root_path:            PathBuf,
-        /// Path to the keypair used to publish price updates, relative to the root
-        pub publish_keypair_path: PathBuf,
-        /// Path to the public key of the Oracle program, relative to the root
-        pub program_key_path:     PathBuf,
-        /// Path to the public key of the root mapping account, relative to the root
-        pub mapping_key_path:     PathBuf,
-    }
-
-    impl Default for Config {
-        fn default() -> Self {
-            Self {
-                root_path:            Default::default(),
-                publish_keypair_path: "publish_key_pair.json".into(),
-                program_key_path:     "program_key.json".into(),
-                mapping_key_path:     "mapping_key.json".into(),
-            }
-        }
-    }
-
-    pub struct KeyStore {
-        /// The keypair used to publish price updates
-        pub publish_keypair: Keypair,
-        /// Public key of the Oracle program
-        pub program_key:     Pubkey,
-        /// Public key of the root mapping account
-        pub mapping_key:     Pubkey,
-    }
-
-    impl KeyStore {
-        pub fn new(config: Config) -> Result<Self> {
-            Ok(KeyStore {
-                publish_keypair: keypair::read_keypair_file(
-                    config.root_path.join(config.publish_keypair_path),
-                )
-                .map_err(|e| anyhow!(e.to_string()))
-                .context("reading publish keypair")?,
-                program_key:     Self::pubkey_from_path(
-                    config.root_path.join(config.program_key_path),
-                )
-                .context("reading program key")?,
-                mapping_key:     Self::pubkey_from_path(
-                    config.root_path.join(config.mapping_key_path),
-                )
-                .context("reading mapping key")?,
-            })
-        }
-
-        fn pubkey_from_path(path: impl AsRef<Path>) -> Result<Pubkey> {
-            let contents = fs::read_to_string(path)?;
-            Pubkey::from_str(contents.trim()).map_err(|e| e.into())
-        }
-    }
-}