gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix banks RPC port (#12570) (#12574)

Browse Source 
* Fix Banks RPC ports

* Add get_account_with_commitment

(cherry picked from commit d158d45051)

Co-authored-by: Greg Fitzgerald <greg@solana.com>
This commit is contained in:
mergify[bot]
2020-09-30 01:23:13 +00:00
committed by GitHub
parent 5d2f450b89
commit 33ace54b0f
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
banks-client/src/lib.rs
View File

@ -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,12 +138,17 @@ 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(),
address,
CommitmentLevel::default(),
)
.await .await
} }

6
cli-config/src/config.rs
View File

@ -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!(