move api into main specific version folder

crates/papyrus_gateway/src/api/mod.rs → crates/papyrus_gateway/src/api.rs

@@ -1,5 +1,3 @@
-pub mod v0_3_0;
-
 use std::collections::HashSet;
 
 use jsonrpsee::{Methods, RpcModule};
@@ -9,8 +7,8 @@ use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::core::{ChainId, ContractAddress};
 use starknet_api::transaction::EventKey;
 
-use self::v0_3_0::v0_3_0_impl::JsonRpcServerV0_3_0Impl;
-use self::v0_3_0::JsonRpcV0_3_0Server;
+use crate::v0_3_0::api::api_impl::JsonRpcServerV0_3_0Impl;
+use crate::v0_3_0::api::JsonRpcV0_3_0Server;
 use crate::v0_3_0::deprecated_contract_class::ContractClass as DeprecatedContractClass;
 use crate::v0_3_0::state::ContractClass;
 use crate::v0_3_0::transaction::Event;

crates/papyrus_gateway/src/api/v0_3_0/mod.rs → crates/papyrus_gateway/src/v0_3_0/api/mod.rs

@@ -7,14 +7,14 @@ use starknet_api::hash::StarkFelt;
 use starknet_api::state::StorageKey;
 use starknet_api::transaction::{TransactionHash, TransactionOffsetInBlock};
 
-use super::{BlockHashAndNumber, BlockId, EventFilter, EventsChunk, GatewayContractClass};
+use crate::api::{BlockHashAndNumber, BlockId, EventFilter, EventsChunk, GatewayContractClass};
 use crate::v0_3_0::block::Block;
 use crate::v0_3_0::state::StateUpdate;
 use crate::v0_3_0::transaction::{TransactionReceiptWithStatus, TransactionWithType};
 
-pub mod v0_3_0_impl;
+pub mod api_impl;
 #[cfg(test)]
-mod v0_3_0_test;
+mod test;
 
 #[versioned_rpc("V0_3_0")]
 pub trait JsonRpc {

crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_test.rs → crates/papyrus_gateway/src/v0_3_0/api/test.rs

@@ -27,14 +27,14 @@ use test_utils::{
     get_rng, get_test_block, get_test_body, get_test_state_diff, send_request, GetTestInstance,
 };
 
-use crate::api::v0_3_0::v0_3_0_impl::JsonRpcServerV0_3_0Impl;
 use crate::api::{
     BlockHashAndNumber, BlockHashOrNumber, BlockId, ContinuationToken, EventFilter, EventsChunk,
     JsonRpcError, Tag,
 };
 use crate::test_utils::{
     get_starknet_spec_api_schema, get_test_gateway_config, get_test_rpc_server_and_storage_writer,
 };
+use crate::v0_3_0::api::api_impl::JsonRpcServerV0_3_0Impl;
 use crate::v0_3_0::block::Block;
 use crate::v0_3_0::deprecated_contract_class::ContractClass as DeprecatedContractClass;
 use crate::v0_3_0::state::{ContractClass, StateUpdate, ThinStateDiff};

crates/papyrus_gateway/src/v0_3_0/mod.rs

@@ -1,3 +1,4 @@
+pub mod api;
 pub mod block;
 pub mod deprecated_contract_class;
 pub mod state;