project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

client: derive cluster ws url like web3.js (#1362)

This commit is contained in:
CherryMan 2022-03-11 12:59:10 -05:00 committed by GitHub
parent 07c7cc1ce5
commit b5ea2a4201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ incremented for features.
* ts: Fix the loss of strict typing using the `methods` namespace on builder functions ([#1539](https://github.com/project-serum/anchor/pull/1539)).
* spl: Update `spl/governance` to use new errors ([#1582](https://github.com/project-serum/anchor/pull/1582)).
* client: Fix `Cluster`'s `FromStr` implementation ([#1362](https://github.com/project-serum/anchor/pull/1362)).
### Breaking

25
client/src/cluster.rs
View File

@ -28,17 +28,16 @@ impl FromStr for Cluster {
"d" | "devnet" => Ok(Cluster::Devnet),
"l" | "localnet" => Ok(Cluster::Localnet),
"g" | "debug" => Ok(Cluster::Debug),
url if url.contains("http") => {
let http_url = url;
_ if s.starts_with("http") => {
let http_url = s;
// Taken from:
// https://github.com/solana-labs/solana/blob/aea8f0df1610248d29d8ca3bc0d60e9fabc99e31/web3.js/src/util/url.ts
// Websocket port is always +1 the http port.
let mut ws_url = Url::parse(http_url)?;
if let Some(port) = ws_url.port() {
ws_url.set_port(Some(port + 1))
.map_err(|_| anyhow!("Unable to set port"))?;
} else {
ws_url.set_port(Some(8900))
.map_err(|_| anyhow!("Unable to set port"))?;
}
if ws_url.scheme() == "https" {
ws_url.set_scheme("wss")
@ -134,7 +133,7 @@ mod tests {
let url = "http://my-url.com/";
let cluster = Cluster::from_str(url).unwrap();
assert_eq!(
Cluster::Custom(url.to_string(), "ws://my-url.com:8900/".to_string()),
Cluster::Custom(url.to_string(), "ws://my-url.com/".to_string()),
cluster
);
}
@ -153,7 +152,17 @@ mod tests {
let url = "https://my-url.com/";
let cluster = Cluster::from_str(url).unwrap();
assert_eq!(
Cluster::Custom(url.to_string(), "wss://my-url.com:8900/".to_string()),
Cluster::Custom(url.to_string(), "wss://my-url.com/".to_string()),
cluster
);
}
#[test]
fn test_upper_case() {
let url = "http://my-url.com/FooBar";
let cluster = Cluster::from_str(url).unwrap();
assert_eq!(
Cluster::Custom(url.to_string(), "ws://my-url.com/FooBar".to_string()),
cluster
);
}