Skip to content

Commit 1aad232

Browse files
committed
rebase fix
1 parent 0b438dc commit 1aad232

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

crates/tap-agent/src/agent/sender_account.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,18 +1040,13 @@ pub mod tests {
10401040
};
10411041

10421042
use crate::test::{create_received_receipt, store_receipt};
1043-
use alloy::hex::ToHexExt;
1044-
use alloy::primitives::{Address, U256};
1043+
10451044
use indexer_monitor::{DeploymentDetails, EscrowAccounts, SubgraphClient};
10461045
use ractor::{call, Actor, ActorRef, ActorStatus};
10471046
use reqwest::Url;
10481047
use serde_json::json;
10491048
use sqlx::PgPool;
1050-
use std::collections::{HashMap, HashSet};
10511049
use std::str::FromStr;
1052-
use std::sync::atomic::AtomicU32;
1053-
use std::sync::Arc;
1054-
use std::time::{Duration, SystemTime, UNIX_EPOCH};
10551050
use tap_aggregator::server::run_server;
10561051
use test_assets::{
10571052
flush_messages, ALLOCATION_ID_0, ALLOCATION_ID_1, TAP_SENDER as SENDER,
@@ -1402,7 +1397,7 @@ pub mod tests {
14021397
// we expect it to create a sender allocation
14031398
sender_account
14041399
.cast(SenderAccountMessage::UpdateAllocationIds(
1405-
vec![*ALLOCATION_ID_0].into_iter().collect(),
1400+
vec![ALLOCATION_ID_0].into_iter().collect(),
14061401
))
14071402
.unwrap();
14081403
notify.notified().await;

crates/tap-agent/src/agent/sender_accounts_manager.rs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -628,23 +628,13 @@ mod tests {
628628
ALLOCATION_ID_1, INDEXER, SENDER_2, SIGNER, TAP_EIP712_DOMAIN_SEPARATOR,
629629
},
630630
};
631-
use alloy::hex::ToHexExt;
632-
use indexer_monitor::{DeploymentDetails, EscrowAccounts, SubgraphClient};
633-
use ractor::concurrency::JoinHandle;
634-
use ractor::{Actor, ActorRef, ActorStatus};
635-
use reqwest::Url;
636-
use ruint::aliases::U256;
631+
637632
use serde_json::json;
638-
use sqlx::postgres::PgListener;
639-
use sqlx::PgPool;
640-
use std::collections::{HashMap, HashSet};
633+
641634
use std::str::FromStr;
642-
use std::sync::Arc;
643-
use std::time::Duration;
635+
644636
use tap_aggregator::server::run_server;
645-
use test_assets::{flush_messages, TAP_SENDER as SENDER};
646-
use tokio::sync::mpsc::error::TryRecvError;
647-
use tokio::sync::{mpsc, watch, Notify};
637+
648638
use wiremock::matchers::{body_string_contains, method};
649639
use wiremock::{Mock, MockGuard, MockServer, ResponseTemplate};
650640

@@ -919,7 +909,7 @@ mod tests {
919909
.clone()
920910
.unwrap()
921911
.cast(SenderAccountMessage::UpdateAllocationIds(
922-
vec![*ALLOCATION_ID_0].into_iter().collect(),
912+
vec![ALLOCATION_ID_0].into_iter().collect(),
923913
))
924914
.unwrap();
925915
flush_messages(&notify).await;

crates/tap-agent/src/agent/sender_allocation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ pub mod tests {
13451345
assert_eq!(
13461346
startup_msg,
13471347
SenderAccountMessage::UpdateReceiptFees(
1348-
*ALLOCATION_ID_0,
1348+
ALLOCATION_ID_0,
13491349
ReceiptFees::UpdateValue(UnaggregatedReceipts {
13501350
value: expected_value,
13511351
last_id: AMOUNT_OF_RECEIPTS,
@@ -1434,7 +1434,7 @@ pub mod tests {
14341434
assert_eq!(
14351435
startup_msg,
14361436
SenderAccountMessage::UpdateReceiptFees(
1437-
*ALLOCATION_ID_0,
1437+
ALLOCATION_ID_0,
14381438
ReceiptFees::UpdateValue(UnaggregatedReceipts {
14391439
value: expected_value,
14401440
last_id: AMOUNT_OF_RECEIPTS,

0 commit comments

Comments
 (0)