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: use channels on TestableActor to be able to verify sent messages #647

Merged
merged 2 commits into from
Mar 6, 2025
Merged

refactor: use channels on TestableActor to be able to verify sent messages #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41f5dbd
refactor: use channels instead of Notify in TestableActor
TypeLevelConsoli Mar 6, 2025
5128e6b
test: use channel response to test received message
TypeLevelConsoli Mar 6, 2025
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
34 changes: 18 additions & 16 deletions crates/service/src/tap/checks/value_check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ use tap_core::receipt::{
Context, WithValueAndTimestamp,
};
use thegraph_core::DeploymentId;
#[cfg(test)]
use tokio::sync::mpsc;

use crate::{
database::cost_model,
Expand Down Expand Up @@ -55,7 +57,7 @@ pub struct MinimumValue {
grace_period: Duration,

#[cfg(test)]
notify: std::sync::Arc<tokio::sync::Notify>,
msg_receiver: mpsc::Receiver<()>,
}

struct CostModelWatcher {
Expand All @@ -66,7 +68,7 @@ struct CostModelWatcher {
updated_at: GracePeriod,

#[cfg(test)]
notify: std::sync::Arc<tokio::sync::Notify>,
sender: mpsc::Sender<()>,
}

impl CostModelWatcher {
Expand All @@ -77,15 +79,15 @@ impl CostModelWatcher {
global_model: GlobalModel,
cancel_token: tokio_util::sync::CancellationToken,
grace_period: GracePeriod,
#[cfg(test)] notify: std::sync::Arc<tokio::sync::Notify>,
#[cfg(test)] sender: mpsc::Sender<()>,
) {
let cost_model_watcher = CostModelWatcher {
pgpool,
global_model,
cost_models,
updated_at: grace_period,
#[cfg(test)]
notify,
sender,
};

loop {
Expand Down Expand Up @@ -119,7 +121,7 @@ impl CostModelWatcher {
Err(_) => self.handle_unexpected_notification(payload).await,
}
#[cfg(test)]
self.notify.notify_one();
self.sender.send(()).await.expect("Channel failed");
}

fn handle_insert(&self, deployment: String, model: String, variables: String) {
Expand Down Expand Up @@ -212,7 +214,7 @@ impl MinimumValue {
);

#[cfg(test)]
let notify = std::sync::Arc::new(tokio::sync::Notify::new());
let (sender, receiver) = mpsc::channel(10);

let watcher_cancel_token = tokio_util::sync::CancellationToken::new();
tokio::spawn(CostModelWatcher::cost_models_watcher(
Expand All @@ -223,7 +225,7 @@ impl MinimumValue {
watcher_cancel_token.clone(),
updated_at.clone(),
#[cfg(test)]
notify.clone(),
sender,
));
Self {
global_model,
Expand All @@ -232,7 +234,7 @@ impl MinimumValue {
updated_at,
grace_period,
#[cfg(test)]
notify,
msg_receiver: receiver,
}
}

Expand Down Expand Up @@ -399,14 +401,14 @@ mod tests {

#[sqlx::test(migrations = "../../migrations")]
async fn should_watch_model_insert(pgpool: PgPool) {
let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
let mut check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
assert_eq!(check.cost_model_map.read().unwrap().len(), 0);

// insert 2 cost models for different deployment_id
let test_models = test::test_data();
add_cost_models(&pgpool, to_db_models(test_models.clone())).await;

flush_messages(&check.notify).await;
flush_messages(&mut check.msg_receiver).await;

assert_eq!(
check.cost_model_map.read().unwrap().len(),
Expand All @@ -420,7 +422,7 @@ mod tests {
let test_models = test::test_data();
add_cost_models(&pgpool, to_db_models(test_models.clone())).await;

let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
let mut check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
assert_eq!(check.cost_model_map.read().unwrap().len(), 2);

// remove
Expand All @@ -429,7 +431,7 @@ mod tests {
.await
.unwrap();

check.notify.notified().await;
check.msg_receiver.recv().await.expect("Channel failed");

assert_eq!(check.cost_model_map.read().unwrap().len(), 0);
}
Expand All @@ -445,12 +447,12 @@ mod tests {

#[sqlx::test(migrations = "../../migrations")]
async fn should_watch_global_model(pgpool: PgPool) {
let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
let mut check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;

let global_model = global_cost_model();
add_cost_models(&pgpool, vec![global_model.clone()]).await;

check.notify.notified().await;
check.msg_receiver.recv().await.expect("Channel failed");

assert!(check.global_model.read().unwrap().is_some());
}
Expand All @@ -460,15 +462,15 @@ mod tests {
let global_model = global_cost_model();
add_cost_models(&pgpool, vec![global_model.clone()]).await;

let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
let mut check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
assert!(check.global_model.read().unwrap().is_some());

sqlx::query!(r#"DELETE FROM "CostModels""#)
.execute(&pgpool)
.await
.unwrap();

check.notify.notified().await;
check.msg_receiver.recv().await.expect("Channel failed");

assert_eq!(check.cost_model_map.read().unwrap().len(), 0);
}
Expand Down
Loading
Loading