blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change module name to represent correct branch (#21125)

This commit is contained in:
Tyera Eulberg 2021-11-01 20:04:29 -06:00 committed by GitHub
parent 1b47f7f2cd
commit 02826a989e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/src/rpc.rs
View File

@ -3715,11 +3715,11 @@ pub mod rpc_full {
} }
// RPC methods deprecated in v1.8 // RPC methods deprecated in v1.8
pub mod rpc_deprecated_v1_8 { pub mod rpc_deprecated_v1_9 {
#![allow(deprecated)] #![allow(deprecated)]
use super::*; use super::*;
#[rpc] #[rpc]
pub trait DeprecatedV1_8 { pub trait DeprecatedV1_9 {
type Metadata; type Metadata;
#[rpc(meta, name = "getRecentBlockhash")] #[rpc(meta, name = "getRecentBlockhash")]
@ -3754,8 +3754,8 @@ pub mod rpc_deprecated_v1_8 {
fn get_snapshot_slot(&self, meta: Self::Metadata) -> Result<Slot>; fn get_snapshot_slot(&self, meta: Self::Metadata) -> Result<Slot>;
} }
pub struct DeprecatedV1_8Impl; pub struct DeprecatedV1_9Impl;
impl DeprecatedV1_8 for DeprecatedV1_8Impl { impl DeprecatedV1_9 for DeprecatedV1_9Impl {
type Metadata = JsonRpcRequestProcessor; type Metadata = JsonRpcRequestProcessor;
fn get_recent_blockhash( fn get_recent_blockhash(
@ -4265,7 +4265,7 @@ pub fn create_test_transactions_and_populate_blockstore(
pub mod tests { pub mod tests {
use { use {
super::{ super::{
rpc_accounts::*, rpc_bank::*, rpc_deprecated_v1_8::*, rpc_full::*, rpc_minimal::*, *, rpc_accounts::*, rpc_bank::*, rpc_deprecated_v1_9::*, rpc_full::*, rpc_minimal::*, *,
}, },
crate::{ crate::{
optimistically_confirmed_bank_tracker::{ optimistically_confirmed_bank_tracker::{
@ -4508,7 +4508,7 @@ pub mod tests {
io.extend_with(rpc_bank::BankDataImpl.to_delegate()); io.extend_with(rpc_bank::BankDataImpl.to_delegate());
io.extend_with(rpc_accounts::AccountsDataImpl.to_delegate()); io.extend_with(rpc_accounts::AccountsDataImpl.to_delegate());
io.extend_with(rpc_full::FullImpl.to_delegate()); io.extend_with(rpc_full::FullImpl.to_delegate());
io.extend_with(rpc_deprecated_v1_8::DeprecatedV1_8Impl.to_delegate()); io.extend_with(rpc_deprecated_v1_9::DeprecatedV1_9Impl.to_delegate());
RpcHandler { RpcHandler {
io, io,
meta, meta,

4
rpc/src/rpc_service.rs
View File

@ -6,7 +6,7 @@ use {
max_slots::MaxSlots, max_slots::MaxSlots,
optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank, optimistically_confirmed_bank_tracker::OptimisticallyConfirmedBank,
rpc::{ rpc::{
rpc_accounts::*, rpc_bank::*, rpc_deprecated_v1_7::*, rpc_deprecated_v1_8::*, rpc_accounts::*, rpc_bank::*, rpc_deprecated_v1_7::*, rpc_deprecated_v1_9::*,
rpc_full::*, rpc_minimal::*, rpc_obsolete_v1_7::*, *, rpc_full::*, rpc_minimal::*, rpc_obsolete_v1_7::*, *,
}, },
rpc_health::*, rpc_health::*,
@ -419,7 +419,7 @@ impl JsonRpcService {
io.extend_with(rpc_accounts::AccountsDataImpl.to_delegate()); io.extend_with(rpc_accounts::AccountsDataImpl.to_delegate());
io.extend_with(rpc_full::FullImpl.to_delegate()); io.extend_with(rpc_full::FullImpl.to_delegate());
io.extend_with(rpc_deprecated_v1_7::DeprecatedV1_7Impl.to_delegate()); io.extend_with(rpc_deprecated_v1_7::DeprecatedV1_7Impl.to_delegate());
io.extend_with(rpc_deprecated_v1_8::DeprecatedV1_8Impl.to_delegate()); io.extend_with(rpc_deprecated_v1_9::DeprecatedV1_9Impl.to_delegate());
} }
if obsolete_v1_7_api { if obsolete_v1_7_api {
io.extend_with(rpc_obsolete_v1_7::ObsoleteV1_7Impl.to_delegate()); io.extend_with(rpc_obsolete_v1_7::ObsoleteV1_7Impl.to_delegate());