From 739fc2583ec5744dc89111bcf671c775bafb0540 Mon Sep 17 00:00:00 2001
From: Nevo Agmon <nevo@starkware.co>
Date: Tue, 11 Jul 2023 14:26:58 +0300
Subject: [PATCH] move api into main specific version folder

---
 crates/papyrus_gateway/src/{api/mod.rs => api.rs}           | 6 ++----
 .../{api/v0_3_0/v0_3_0_impl.rs => v0_3_0/api/api_impl.rs}   | 0
 .../papyrus_gateway/src/{api/v0_3_0 => v0_3_0/api}/mod.rs   | 6 +++---
 .../src/{api/v0_3_0/v0_3_0_test.rs => v0_3_0/api/test.rs}   | 2 +-
 crates/papyrus_gateway/src/v0_3_0/mod.rs                    | 1 +
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename crates/papyrus_gateway/src/{api/mod.rs => api.rs} (97%)
 rename crates/papyrus_gateway/src/{api/v0_3_0/v0_3_0_impl.rs => v0_3_0/api/api_impl.rs} (100%)
 rename crates/papyrus_gateway/src/{api/v0_3_0 => v0_3_0/api}/mod.rs (96%)
 rename crates/papyrus_gateway/src/{api/v0_3_0/v0_3_0_test.rs => v0_3_0/api/test.rs} (99%)

diff --git a/crates/papyrus_gateway/src/api/mod.rs b/crates/papyrus_gateway/src/api.rs
similarity index 97%
rename from crates/papyrus_gateway/src/api/mod.rs
rename to crates/papyrus_gateway/src/api.rs
index 1649394c75..53bacea1ba 100644
--- a/crates/papyrus_gateway/src/api/mod.rs
+++ b/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;
diff --git a/crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_impl.rs b/crates/papyrus_gateway/src/v0_3_0/api/api_impl.rs
similarity index 100%
rename from crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_impl.rs
rename to crates/papyrus_gateway/src/v0_3_0/api/api_impl.rs
diff --git a/crates/papyrus_gateway/src/api/v0_3_0/mod.rs b/crates/papyrus_gateway/src/v0_3_0/api/mod.rs
similarity index 96%
rename from crates/papyrus_gateway/src/api/v0_3_0/mod.rs
rename to crates/papyrus_gateway/src/v0_3_0/api/mod.rs
index a5089f5251..66fd5e4afd 100644
--- a/crates/papyrus_gateway/src/api/v0_3_0/mod.rs
+++ b/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 {
diff --git a/crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_test.rs b/crates/papyrus_gateway/src/v0_3_0/api/test.rs
similarity index 99%
rename from crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_test.rs
rename to crates/papyrus_gateway/src/v0_3_0/api/test.rs
index 08b84b0656..e435c17e12 100644
--- a/crates/papyrus_gateway/src/api/v0_3_0/v0_3_0_test.rs
+++ b/crates/papyrus_gateway/src/v0_3_0/api/test.rs
@@ -27,7 +27,6 @@ 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,
@@ -35,6 +34,7 @@ use crate::api::{
 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};
diff --git a/crates/papyrus_gateway/src/v0_3_0/mod.rs b/crates/papyrus_gateway/src/v0_3_0/mod.rs
index d82fc6d57d..9e20a29495 100644
--- a/crates/papyrus_gateway/src/v0_3_0/mod.rs
+++ b/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;