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

Handle server.version with min/max arguments

Browse Source
This commit is contained in:
Roman Zeyde 2020-11-04 12:17:32 +02:00
parent b2b08ceaff
commit bc30a9b0a0
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
electrs_rpc/src/rpc.rs
View File

@ -185,6 +185,13 @@ impl From<TxGetArgs> for (Txid, bool) {
}
}
#[derive(Deserialize, Debug, PartialEq, Eq)]
#[serde(untagged)]
enum ClientVersion {
Single(String),
Range(String, String),
}
pub(crate) struct Rpc {
index: Index,
daemon: Daemon,
@ -496,15 +503,18 @@ impl Rpc {
Ok(json!(self.mempool.histogram()))
}
fn version(&self, (client_id, client_version): (String, String)) -> Result<Value> {
if client_version != PROTOCOL_VERSION {
bail!(
"{} requested {}, server supports {}",
client_id,
client_version,
PROTOCOL_VERSION
);
}
fn version(&self, (client_id, client_version): (String, ClientVersion)) -> Result<Value> {
match client_version {
ClientVersion::Single(v) if v == PROTOCOL_VERSION => (),
_ => {
bail!(
"{} requested {:?}, server supports {}",
client_id,
client_version,
PROTOCOL_VERSION
);
}
};
let server_id = format!("electrs/{}", ELECTRS_VERSION);
Ok(json!([server_id, PROTOCOL_VERSION]))
}