diff --git a/src/bank.rs b/src/bank.rs index 5b4ab9126d..670f380152 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -80,11 +80,6 @@ pub enum BankError { pub type Result = result::Result; -pub trait BankSubscriptions { - fn check_account(&self, pubkey: &Pubkey, account: &Account); - fn check_signature(&self, signature: &Signature, status: &Result<()>); -} - type BankStatusCache = StatusCache; /// Manager for the state of all accounts and programs after processing its entries. diff --git a/src/rpc_pubsub.rs b/src/rpc_pubsub.rs index bb29fbaa34..dfdf1090dc 100644 --- a/src/rpc_pubsub.rs +++ b/src/rpc_pubsub.rs @@ -1,7 +1,7 @@ //! The `pubsub` module implements a threaded subscription service on client RPC request use crate::bank; -use crate::bank::{Bank, BankError, BankSubscriptions}; +use crate::bank::{Bank, BankError}; use crate::rpc::RpcSignatureStatus; use crate::service::Service; use bs58; @@ -161,8 +161,8 @@ impl Default for RpcSubscriptions { } } -impl BankSubscriptions for RpcSubscriptions { - fn check_account(&self, pubkey: &Pubkey, account: &Account) { +impl RpcSubscriptions { + pub fn check_account(&self, pubkey: &Pubkey, account: &Account) { let subscriptions = self.account_subscriptions.read().unwrap(); if let Some(hashmap) = subscriptions.get(pubkey) { for (_bank_sub_id, sink) in hashmap.iter() { @@ -171,7 +171,7 @@ impl BankSubscriptions for RpcSubscriptions { } } - fn check_signature(&self, signature: &Signature, bank_error: &bank::Result<()>) { + pub fn check_signature(&self, signature: &Signature, bank_error: &bank::Result<()>) { let status = match bank_error { Ok(_) => RpcSignatureStatus::Confirmed, Err(BankError::AccountInUse) => RpcSignatureStatus::AccountInUse, @@ -187,9 +187,7 @@ impl BankSubscriptions for RpcSubscriptions { } subscriptions.remove(&signature); } -} -impl RpcSubscriptions { pub fn add_account_subscription( &self, pubkey: &Pubkey,