Skip to content

Commit a24e5c3

Browse files
committed
Deprecate DynRequestSender type alias
The idea is to reduce the number of concepts. Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
1 parent 11a8072 commit a24e5c3

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

crates/core/tedge_actors/src/builders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pub trait MessageSink<M: Message> {
177177
/// The [Builder] of an [Actor](crate::Actor) must implement this trait
178178
/// for every message type that actor can send to its peers.
179179
///
180-
/// To receive messages from a `MessageSource<M, C>`, the peer must be a `MessageSink<M>`.
180+
/// To receive messages from a `MessageSource<M, C>`, the peer must be a `MessageSink<From<M>`.
181181
pub trait MessageSource<M: Message, Config> {
182182
/// The message will be sent to the peer using the provided `sender`
183183
fn register_peer(&mut self, config: Config, sender: DynSender<M>);

crates/core/tedge_actors/src/servers/builders.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use crate::Builder;
44
use crate::CloneSender;
55
use crate::ConcurrentServerActor;
66
use crate::ConcurrentServerMessageBox;
7-
use crate::DynRequestSender;
87
use crate::DynSender;
98
use crate::LoggingReceiver;
109
use crate::Message;
@@ -52,7 +51,7 @@ impl<Request: Message, Response: Message> ServerMessageBoxBuilder<Request, Respo
5251
}
5352

5453
/// Return a sender for the requests
55-
pub fn request_sender(&self) -> DynRequestSender<Request, Response> {
54+
pub fn request_sender(&self) -> DynSender<RequestEnvelope<Request, Response>> {
5655
self.request_sender.sender_clone()
5756
}
5857

@@ -134,7 +133,7 @@ impl<S: Server, K> ServerActorBuilder<S, K> {
134133
}
135134

136135
/// Return a sender for the requests
137-
pub fn request_sender(&self) -> DynRequestSender<S::Request, S::Response> {
136+
pub fn request_sender(&self) -> DynSender<RequestEnvelope<S::Request, S::Response>> {
138137
self.box_builder.request_sender()
139138
}
140139
}

crates/core/tedge_actors/src/servers/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@ impl<Request, Response> AsRef<Request> for RequestEnvelope<Request, Response> {
144144
}
145145
}
146146

147-
/// A request sender to some [Server]
148-
pub type DynRequestSender<Request, Response> = DynSender<RequestEnvelope<Request, Response>>;
149-
150147
/// A connector to a [Server] expecting Request and returning Response.
151148
pub trait Service<Request: Message, Response: Message>:
152149
MessageSink<RequestEnvelope<Request, Response>>

crates/core/tedge_actors/src/test_helpers.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
use crate::Builder;
33
use crate::ChannelError;
44
use crate::CloneSender;
5-
use crate::DynRequestSender;
65
use crate::DynSender;
76
use crate::Message;
87
use crate::MessageReceiver;
@@ -662,7 +661,7 @@ pub trait ServiceProviderExt<I: Message, O: Message> {
662661
fn new_client_box(&mut self) -> SimpleMessageBox<O, I>;
663662
}
664663

665-
impl<I: Message, O: Message> ServiceProviderExt<I, O> for DynRequestSender<I, O> {
664+
impl<I: Message, O: Message> ServiceProviderExt<I, O> for DynSender<RequestEnvelope<I, O>> {
666665
fn new_client_box(&mut self) -> SimpleMessageBox<O, I> {
667666
let name = "client-box";
668667
let capacity = 16;

crates/core/tedge_actors/src/tests.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl Server for SleepService {
2727
}
2828
}
2929

30-
async fn spawn_sleep_service() -> DynRequestSender<u64, u64> {
30+
async fn spawn_sleep_service() -> DynSender<RequestEnvelope<u64, u64>> {
3131
let config = ServerConfig::default();
3232
let actor = ServerActorBuilder::new(SleepService, &config, Sequential);
3333
let handle = actor.request_sender();
@@ -37,7 +37,9 @@ async fn spawn_sleep_service() -> DynRequestSender<u64, u64> {
3737
handle
3838
}
3939

40-
async fn spawn_concurrent_sleep_service(max_concurrency: usize) -> DynRequestSender<u64, u64> {
40+
async fn spawn_concurrent_sleep_service(
41+
max_concurrency: usize,
42+
) -> DynSender<RequestEnvelope<u64, u64>> {
4143
let config = ServerConfig::default().with_max_concurrency(max_concurrency);
4244
let actor = ServerActorBuilder::new(SleepService, &config, Concurrent);
4345
let handle = actor.request_sender();

0 commit comments

Comments
 (0)