Skip to content

Commit 950ae1d

Browse files
committed
Change from_id return type to Self
`from_id` does not fail so it shouldn't return an `Result`.
1 parent 31258eb commit 950ae1d

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

payjoin-cli/src/app/v2/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl AppTrait for App {
114114
.expect("Receiver pubkey should exist if session id exists");
115115
if session_receiver_pubkey == *receiver_pubkey {
116116
let sender_persister =
117-
SenderPersister::from_id(self.db.clone(), session_id).ok()?;
117+
SenderPersister::from_id(self.db.clone(), session_id);
118118
let (send_session, _) = replay_sender_event_log(&sender_persister)
119119
.map_err(|e| anyhow!("Failed to replay sender event log: {:?}", e))
120120
.ok()?;
@@ -190,7 +190,7 @@ impl AppTrait for App {
190190

191191
for session_id in recv_session_ids {
192192
let self_clone = self.clone();
193-
let recv_persister = ReceiverPersister::from_id(self.db.clone(), session_id)?;
193+
let recv_persister = ReceiverPersister::from_id(self.db.clone(), session_id);
194194
let receiver_state = replay_receiver_event_log(&recv_persister)
195195
.map_err(|e| anyhow!("Failed to replay receiver event log: {:?}", e))?
196196
.0;
@@ -200,7 +200,7 @@ impl AppTrait for App {
200200
}
201201

202202
for session_id in send_session_ids {
203-
let sender_persiter = SenderPersister::from_id(self.db.clone(), session_id)?;
203+
let sender_persiter = SenderPersister::from_id(self.db.clone(), session_id);
204204
let sender_state = replay_sender_event_log(&sender_persiter)
205205
.map_err(|e| anyhow!("Failed to replay sender event log: {:?}", e))?
206206
.0;

payjoin-cli/src/db/v2.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ impl SenderPersister {
3636
Ok(Self { db, session_id: SessionId(session_id) })
3737
}
3838

39-
pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
40-
Ok(Self { db, session_id: id })
41-
}
39+
pub fn from_id(db: Arc<Database>, id: SessionId) -> Self { Self { db, session_id: id } }
4240
}
4341

4442
impl SessionPersister for SenderPersister {
@@ -117,9 +115,7 @@ impl ReceiverPersister {
117115
Ok(Self { db, session_id: SessionId(session_id) })
118116
}
119117

120-
pub fn from_id(db: Arc<Database>, id: SessionId) -> crate::db::Result<Self> {
121-
Ok(Self { db, session_id: id })
122-
}
118+
pub fn from_id(db: Arc<Database>, id: SessionId) -> Self { Self { db, session_id: id } }
123119
}
124120

125121
impl SessionPersister for ReceiverPersister {

0 commit comments

Comments
 (0)