4nk/sdk_relay
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes in commit

Browse Source
This commit is contained in:
NicolasCantu 2025-02-14 16:19:27 +01:00 committed by Nicolas Cantu
parent 616dc21aa9
commit 9c7e628c8e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/commit.rs
View File

@ -1,5 +1,5 @@
use std::{ use std::{
collections::HashMap, collections::{HashMap, HashSet},
sync::{Mutex, MutexGuard, OnceLock}, sync::{Mutex, MutexGuard, OnceLock},
}; };
@ -14,7 +14,6 @@ use sdk_common::sp_client::spclient::Recipient;
use sdk_common::network::{AnkFlag, CommitMessage, HandshakeMessage}; use sdk_common::network::{AnkFlag, CommitMessage, HandshakeMessage};
use sdk_common::sp_client::bitcoin::{Amount, OutPoint}; use sdk_common::sp_client::bitcoin::{Amount, OutPoint};
use sdk_common::process::{lock_processes, Process, ProcessState}; use sdk_common::process::{lock_processes, Process, ProcessState};
use serde_json::json;
use crate::message::{broadcast_message, BroadcastType}; use crate::message::{broadcast_message, BroadcastType};
use crate::{lock_freezed_utxos, MutexExt, DAEMON, STORAGE, WALLET}; use crate::{lock_freezed_utxos, MutexExt, DAEMON, STORAGE, WALLET};
@ -133,14 +132,13 @@ fn handle_member_list(roles: &HashMap<String, RoleDefinition>, process_id: OutPo
if let Some(pairing_role) = roles.get("pairing") { if let Some(pairing_role) = roles.get("pairing") {
if pairing_role.members.len() == 1 { if pairing_role.members.len() == 1 {
let member = pairing_role.members.get(0).unwrap(); if let Some(member) = pairing_role.members.get(0) {
let mut memberlist = lock_members()?; let mut memberlist = lock_members()?;
memberlist.insert( memberlist.insert(
process_id, process_id,
member.to_owned(), member.to_owned());
); return Ok(process_id);
}
return Ok(process_id);
} }
} }
@ -221,7 +219,7 @@ fn register_new_state(process: &mut Process, commit_msg: &CommitMessage) -> Resu
.iter() .iter()
.any(|state| state.state_id == new_state_id) .any(|state| state.state_id == new_state_id)
{ {
return Err(Error::msg("Can't add an already existing state")); return Err(Error::msg(format!("{}", new_state_id)));
} }
// Add the new state // Add the new state