Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: migrate adapter service to api #117

Merged
merged 1 commit into from
Apr 23, 2024
Merged

refactor: migrate adapter service to api #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ async-trait = "0.1.79"
warp = { version = "0.3.6", features = ["websocket"] }
tokio = { version = "1.37.0", features = ["full"] }
tokio-stream = "0.1.15"
futures = { version = "0.3.30" }
futures-util = { version = "0.3.30", default-features = false, features = [
"sink",
] }
Expand Down
41 changes: 23 additions & 18 deletions src/agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,16 @@ pub mod store;
use {
self::{
config::Config,
pythd::api::rpc,
pythd::{
adapter::notifier,
api::rpc,
},
solana::network,
},
anyhow::Result,
futures_util::future::join_all,
slog::Logger,
std::sync::Arc,
tokio::sync::{
broadcast,
mpsc,
Expand Down Expand Up @@ -113,8 +117,7 @@ impl Agent {

// Create the channels
// TODO: make all components listen to shutdown signal
let (shutdown_tx, shutdown_rx) =
broadcast::channel(self.config.channel_capacities.shutdown);
let (shutdown_tx, _) = broadcast::channel(self.config.channel_capacities.shutdown);
let (primary_oracle_updates_tx, primary_oracle_updates_rx) =
mpsc::channel(self.config.channel_capacities.primary_oracle_updates);
let (secondary_oracle_updates_tx, secondary_oracle_updates_rx) =
Expand All @@ -123,8 +126,6 @@ impl Agent {
mpsc::channel(self.config.channel_capacities.global_store_lookup);
let (local_store_tx, local_store_rx) =
mpsc::channel(self.config.channel_capacities.local_store);
let (pythd_adapter_tx, pythd_adapter_rx) =
mpsc::channel(self.config.channel_capacities.pythd_adapter);
let (primary_keypair_loader_tx, primary_keypair_loader_rx) = mpsc::channel(10);
let (secondary_keypair_loader_tx, secondary_keypair_loader_rx) = mpsc::channel(10);

Expand Down Expand Up @@ -152,34 +153,38 @@ impl Agent {
)?);
}

// Create the Pythd Adapter.
let adapter = Arc::new(pythd::adapter::Adapter::new(
self.config.pythd_adapter.clone(),
global_store_lookup_tx.clone(),
local_store_tx.clone(),
logger.clone(),
));

// Create the Notifier task for the Pythd RPC.
jhs.push(tokio::spawn(notifier(
adapter.clone(),
shutdown_tx.subscribe(),
)));

// Spawn the Global Store
jhs.push(store::global::spawn_store(
global_store_lookup_rx,
primary_oracle_updates_rx,
secondary_oracle_updates_rx,
pythd_adapter_tx.clone(),
adapter.clone(),
logger.clone(),
));

// Spawn the Local Store
jhs.push(store::local::spawn_store(local_store_rx, logger.clone()));

// Spawn the Pythd Adapter
jhs.push(pythd::adapter::spawn_adapter(
self.config.pythd_adapter.clone(),
pythd_adapter_rx,
global_store_lookup_tx.clone(),
local_store_tx.clone(),
shutdown_tx.subscribe(),
logger.clone(),
));

// Spawn the Pythd API Server
jhs.push(tokio::spawn(rpc::run(
self.config.pythd_api_server.clone(),
logger.clone(),
pythd_adapter_tx,
shutdown_rx,
adapter,
shutdown_tx.subscribe(),
)));

// Spawn the metrics server
Expand Down
Loading
Loading