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

A few small fixes

Browse Source
This commit is contained in:
Roman Zeyde 2020-07-31 10:25:22 +03:00
parent 4764dccbbe
commit 33aaf7ddc6
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc.rs
View File

@ -7,7 +7,7 @@ use serde_json::{from_str, Value};
use std::collections::HashMap;
use std::io::{BufRead, BufReader, Write};
use std::net::{Shutdown, SocketAddr, TcpListener, TcpStream};
use std::sync::mpsc::{self, Sender, SyncSender, Receiver, TrySendError};
use std::sync::mpsc::{self, Receiver, Sender, SyncSender, TrySendError};
use std::sync::{Arc, Mutex};
use std::thread;
@ -74,7 +74,7 @@ struct Connection {
status_hashes: HashMap<Sha256dHash, Value>, // ScriptHash -> StatusHash
stream: TcpStream,
addr: SocketAddr,
chan: SyncSender<Message>,
sender: SyncSender<Message>,
stats: Arc<Stats>,
relayfee: f64,
}
@ -86,7 +86,7 @@ impl Connection {
addr: SocketAddr,
stats: Arc<Stats>,
relayfee: f64,
chan: SyncSender<Message>,
sender: SyncSender<Message>,
) -> Connection {
Connection {
query,
@ -94,7 +94,7 @@ impl Connection {
status_hashes: HashMap::new(),
stream,
addr,
chan,
sender,
stats,
relayfee,
}
@ -252,7 +252,7 @@ impl Connection {
let tx: Transaction = deserialize(&tx).chain_err(|| "failed to parse tx")?;
let txid = self.query.broadcast(&tx)?;
self.query.update_mempool()?;
if let Err(e) = self.chan.try_send(Message::PeriodicUpdate) {
if let Err(e) = self.sender.try_send(Message::PeriodicUpdate) {
warn!("failed to issue PeriodicUpdate after broadcast: {}", e);
}
Ok(json!(txid.to_hex()))
@ -424,7 +424,7 @@ impl Connection {
}
}
fn handle_requests(mut reader: BufReader<TcpStream>, tx: SyncSender<Message>) -> Result<()> {
fn parse_requests(mut reader: BufReader<TcpStream>, tx: SyncSender<Message>) -> Result<()> {
loop {
let mut line = Vec::<u8>::new();
reader
@ -454,8 +454,8 @@ impl Connection {
pub fn run(mut self, receiver: Receiver<Message>) {
let reader = BufReader::new(self.stream.try_clone().expect("failed to clone TcpStream"));
let tx = self.chan.clone();
let child = spawn_thread("reader", || Connection::handle_requests(reader, tx));
let sender = self.sender.clone();
let child = spawn_thread("reader", || Connection::parse_requests(reader, sender));
if let Err(e) = self.handle_replies(receiver) {
error!(
"[{}] connection handling failed: {}",