Skip to content

Commit 744c661

Browse files
committed
Re-use SenderToken for multiparty sender
These were indentical storage tokens and can be reconciled. This was a follow up item from the [PR that introduce persistence](payjoin#552 (comment))
1 parent bc158e4 commit 744c661

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

payjoin/src/send/multiparty/persist.rs

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
use std::fmt::{self, Display};
2-
3-
use url::Url;
4-
51
use crate::persist::{self, Persister};
62
use crate::send::multiparty::{ImplementationError, NewSender, Sender};
7-
use crate::send::v2;
3+
use crate::send::v2::{self, SenderToken};
84

95
impl NewSender {
106
pub fn persist<P: Persister<Sender>>(
@@ -17,21 +13,6 @@ impl NewSender {
1713
}
1814
}
1915

20-
#[derive(Clone, Debug, PartialEq, Eq)]
21-
pub struct SenderToken(Url);
22-
23-
impl Display for SenderToken {
24-
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }
25-
}
26-
27-
impl From<Sender> for SenderToken {
28-
fn from(sender: Sender) -> Self { SenderToken(sender.0.endpoint().clone()) }
29-
}
30-
31-
impl AsRef<[u8]> for SenderToken {
32-
fn as_ref(&self) -> &[u8] { self.0.as_str().as_bytes() }
33-
}
34-
3516
impl persist::Value for Sender {
3617
type Key = SenderToken;
3718

@@ -42,7 +23,7 @@ impl Sender {
4223
pub fn load<P: Persister<Sender>>(
4324
token: P::Token,
4425
persister: &P,
45-
) -> Result<Self, ImplementationError> {
26+
) -> Result<Self, ImplementationError> {
4627
let sender = persister.load(token).map_err(ImplementationError::from)?;
4728
Ok(sender)
4829
}

payjoin/src/send/v2/persist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::persist::Value;
77

88
/// Opaque key type for the sender
99
#[derive(Debug, Clone, PartialEq, Eq)]
10-
pub struct SenderToken(Url);
10+
pub struct SenderToken(pub(crate) Url);
1111

1212
impl Display for SenderToken {
1313
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "{}", self.0) }

0 commit comments

Comments
 (0)