Fix banks RPC port (#12570)
* Fix Banks RPC ports * Add get_account_with_commitment
This commit is contained in:
parent
82848d6c73
commit
d158d45051
|
@ -71,6 +71,14 @@ pub trait BanksClientExt {
|
||||||
/// are said to be finalized. The cluster will not fork to a higher slot height.
|
/// are said to be finalized. The cluster will not fork to a higher slot height.
|
||||||
async fn get_root_slot(&mut self) -> io::Result<Slot>;
|
async fn get_root_slot(&mut self) -> io::Result<Slot>;
|
||||||
|
|
||||||
|
/// Return the account at the given address at the slot corresponding to the given
|
||||||
|
/// commitment level. If the account is not found, None is returned.
|
||||||
|
async fn get_account_with_commitment(
|
||||||
|
&mut self,
|
||||||
|
address: Pubkey,
|
||||||
|
commitment: CommitmentLevel,
|
||||||
|
) -> io::Result<Option<Account>>;
|
||||||
|
|
||||||
/// Return the account at the given address at the time of the most recent root slot.
|
/// Return the account at the given address at the time of the most recent root slot.
|
||||||
/// If the account is not found, None is returned.
|
/// If the account is not found, None is returned.
|
||||||
async fn get_account(&mut self, address: Pubkey) -> io::Result<Option<Account>>;
|
async fn get_account(&mut self, address: Pubkey) -> io::Result<Option<Account>>;
|
||||||
|
@ -130,13 +138,18 @@ impl BanksClientExt for BanksClient {
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn get_account_with_commitment(
|
||||||
|
&mut self,
|
||||||
|
address: Pubkey,
|
||||||
|
commitment: CommitmentLevel,
|
||||||
|
) -> io::Result<Option<Account>> {
|
||||||
|
self.get_account_with_commitment_and_context(context::current(), address, commitment)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
async fn get_account(&mut self, address: Pubkey) -> io::Result<Option<Account>> {
|
async fn get_account(&mut self, address: Pubkey) -> io::Result<Option<Account>> {
|
||||||
self.get_account_with_commitment_and_context(
|
self.get_account_with_commitment(address, CommitmentLevel::default())
|
||||||
context::current(),
|
.await
|
||||||
address,
|
|
||||||
CommitmentLevel::default(),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn get_balance_with_commitment(
|
async fn get_balance_with_commitment(
|
||||||
|
|
|
@ -82,7 +82,7 @@ impl Config {
|
||||||
return "".to_string();
|
return "".to_string();
|
||||||
}
|
}
|
||||||
let mut url = json_rpc_url.unwrap();
|
let mut url = json_rpc_url.unwrap();
|
||||||
let port = url.port_or_known_default().unwrap_or(80);
|
let port = url.port().unwrap_or(8899);
|
||||||
url.set_port(Some(port + 3)).expect("unable to set port");
|
url.set_port(Some(port + 3)).expect("unable to set port");
|
||||||
url.to_string()
|
url.to_string()
|
||||||
}
|
}
|
||||||
|
@ -138,12 +138,12 @@ mod test {
|
||||||
fn compute_rpc_banks_url() {
|
fn compute_rpc_banks_url() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Config::compute_rpc_banks_url(&"http://devnet.solana.com"),
|
Config::compute_rpc_banks_url(&"http://devnet.solana.com"),
|
||||||
"http://devnet.solana.com:83/".to_string()
|
"http://devnet.solana.com:8902/".to_string()
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Config::compute_rpc_banks_url(&"https://devnet.solana.com"),
|
Config::compute_rpc_banks_url(&"https://devnet.solana.com"),
|
||||||
"https://devnet.solana.com:446/".to_string()
|
"https://devnet.solana.com:8902/".to_string()
|
||||||
);
|
);
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|
Loading…
Reference in New Issue