mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2024-11-19 09:54:09 +01:00
Code Issues Projects Releases Wiki Activity

Rename subscription map

Browse Source
This commit is contained in:
Roman Zeyde 2020-11-09 08:42:27 +02:00
parent 239900ed30
commit 3097759686
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
electrs_rpc/src/rpc.rs
View File

@ -113,14 +113,14 @@ impl Status {
pub(crate) struct Subscription {
tip: Option<BlockHash>,
status: HashMap<ScriptHash, Status>,
scripthashes: HashMap<ScriptHash, Status>,
}
impl Subscription {
pub(crate) fn new() -> Self {
Self {
tip: None,
status: HashMap::new(),
scripthashes: HashMap::new(),
}
}
}
@ -308,7 +308,7 @@ impl Rpc {
};
drop(map);
for (scripthash, status) in subscription.status.iter_mut() {
for (scripthash, status) in subscription.scripthashes.iter_mut() {
let current_hash = status.hash;
let (mut entries, tip) = if status.tip == current_tip {
(status.confirmed(), status.tip)
@ -382,7 +382,7 @@ impl Rpc {
subscription: &Subscription,
(scripthash,): (ScriptHash,),
) -> Result<Value> {
match subscription.status.get(&scripthash) {
match subscription.scripthashes.get(&scripthash) {
Some(status) => Ok(json!(status.entries)),
None => bail!("no subscription for scripthash"),
}
@ -397,7 +397,7 @@ impl Rpc {
entries.extend(self.get_unconfirmed(&scripthash));
let status = Status::new(entries, tip);
let hash = status.hash;
subscription.status.insert(scripthash, status);
subscription.scripthashes.insert(scripthash, status);
Ok(json!(hash))
}
@ -406,7 +406,10 @@ impl Rpc {
subscription: &mut Subscription,
(scripthash,): (ScriptHash,),
) -> Result<Value> {
Ok(json!(subscription.status.remove(&scripthash).is_some()))
Ok(json!(subscription
.scripthashes
.remove(&scripthash)
.is_some()))
}
fn get_confirmed(&self, scripthash: &ScriptHash) -> Result<(Vec<TxEntry>, BlockHash)> {