use filename.rs instead of mod.rs everywhere (#98)

Co-authored-by: Dmitrii Korchagin <d.korchagin@ston.fi>

Author: Sild

examples/ton_transfer.rs

@@ -10,13 +10,13 @@ mod example {
     use std::time::Duration;
     use ton_lib::block_tlb::{Coins, CommonMsgInfoInt, Msg};
     use ton_lib::block_tlb::{CommonMsgInfo, CurrencyCollection};
-    use ton_lib::clients::tl_client::tl::client::TLClientTrait;
-    use ton_lib::clients::tl_client::TLClient;
-    use ton_lib::clients::tl_client::TLClientConfig;
-    use ton_lib::contracts::contract_client::{ContractClient, ContractClientConfig};
     use ton_lib::contracts::tl_provider::TLProvider;
+    use ton_lib::contracts::{ContractClient, ContractClientConfig};
     use ton_lib::contracts::{TonContract, TonWalletContract, TonWalletMethods};
     use ton_lib::sys_utils::sys_tonlib_set_verbosity_level;
+    use ton_lib::tl_client::tl::client::TLClientTrait;
+    use ton_lib::tl_client::TLClient;
+    use ton_lib::tl_client::TLClientConfig;
     use ton_lib::wallet::WalletVersion;
     use ton_lib::wallet::{Mnemonic, TonWallet};
     use ton_lib_core::cell::TonCell;

ton/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ton_lib"
-version = "0.0.39"
+version = "0.0.1"
 description.workspace = true
 keywords.workspace = true
 edition.workspace = true

ton/src/block_tlb/mod.rs ton/src/block_tlb.rston/src/block_tlb/mod.rs renamed to ton/src/block_tlb.rs

@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod _test_block_data;
 
-mod account;
+mod account_types;
 mod block_types;
 mod coins;
 mod config_types;
@@ -13,7 +13,7 @@ mod state_init;
 mod tvm_types;
 mod tx_types;
 
-pub use account::*;
+pub use account_types::*;
 pub use block_types::*;
 pub use coins::*;
 pub use config_types::*;

ton/src/block_tlb/account_types.rs

@@ -0,0 +1,9 @@
+mod account_state;
+mod account_status;
+mod account_storage;
+mod shard_account;
+
+pub use account_state::*;
+pub use account_status::*;
+pub use account_storage::*;
+pub use shard_account::*;

ton/src/block_tlb/account_types/account_state.rs

@@ -0,0 +1,26 @@
+use crate::block_tlb::StateInit;
+use ton_lib_core::cell::TonHash;
+use ton_lib_core::TLB;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub enum AccountState {
+    Uninit(AccountStateUninit),
+    Frozen(AccountStateFrozen),
+    Active(AccountStateActive),
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b00, bits_len = 2)]
+pub struct AccountStateUninit;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b01, bits_len = 2)]
+pub struct AccountStateFrozen {
+    pub state_hash: TonHash,
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b1, bits_len = 1)]
+pub struct AccountStateActive {
+    pub state_init: StateInit,
+}

ton/src/block_tlb/account_types/account_status.rs

@@ -0,0 +1,30 @@
+use ton_lib_core::TLB;
+
+// https://github.com/ton-blockchain/ton/blob/ed4682066978f69ffa38dd98912ca77d4f660f66/crypto/block/block.tlb#L271
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub enum AccountStatus {
+    Uninit(AccountStatusUninit),
+    Frozen(AccountStatusFrozen),
+    Active(AccountStatusActive),
+    NonExist(AccountStatusNotExist),
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b00, bits_len = 2)]
+pub struct AccountStatusUninit;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b01, bits_len = 2)]
+pub struct AccountStatusFrozen;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b10, bits_len = 2)]
+pub struct AccountStatusActive;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b11, bits_len = 2)]
+pub struct AccountStatusNotExist;
+
+impl Default for AccountStatus {
+    fn default() -> Self { AccountStatus::NonExist(AccountStatusNotExist) }
+}

ton/src/block_tlb/account_types/account_storage.rs

@@ -0,0 +1,41 @@
+use crate::block_tlb::*;
+use ton_lib_core::cell::TonHash;
+use ton_lib_core::types::tlb_core::VarLenBytes;
+use ton_lib_core::TLB;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub struct StorageUsed {
+    pub cells: VarLenBytes<u64, 3>,
+    pub bits: VarLenBytes<u64, 3>,
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub struct StorageInfo {
+    pub used: StorageUsed,
+    pub storage_extra: MaybeStorageExtraInfo,
+    pub last_paid: u32,
+    pub due_payment: Option<Coins>,
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub struct AccountStorage {
+    pub last_tx_lt: u64,
+    pub balance: CurrencyCollection,
+    pub state: AccountState,
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+pub enum MaybeStorageExtraInfo {
+    None(StorageExtraInfoNone),
+    Info(StorageExtraInfo),
+}
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b000, bits_len = 3)]
+pub struct StorageExtraInfoNone;
+
+#[derive(Debug, Clone, PartialEq, TLB)]
+#[tlb(prefix = 0b001, bits_len = 3)]
+pub struct StorageExtraInfo {
+    pub dict_hash: TonHash,
+}

ton/src/block_tlb/account.rs …block_tlb/account_types/shard_account.rston/src/block_tlb/account.rs renamed to ton/src/block_tlb/account_types/shard_account.rs ton/src/block_tlb/account.rs renamed to ton/src/block_tlb/account_types/shard_account.rs

@@ -1,7 +1,7 @@
-use crate::block_tlb::{Coins, CurrencyCollection, StateInit};
+use crate::block_tlb::*;
 use crate::tlb_adapters::TLBRef;
 use ton_lib_core::cell::{TonCellRef, TonHash};
-use ton_lib_core::types::tlb_core::{MsgAddressInt, VarLenBytes};
+use ton_lib_core::types::tlb_core::MsgAddressInt;
 use ton_lib_core::TLB;
 
 #[derive(Default, Debug, Clone, PartialEq, TLB)]
@@ -33,91 +33,6 @@ pub struct Account {
     pub storage: AccountStorage,
 }
 
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub struct StorageUsed {
-    pub cells: VarLenBytes<u64, 3>,
-    pub bits: VarLenBytes<u64, 3>,
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub struct StorageInfo {
-    pub used: StorageUsed,
-    pub storage_extra: MaybeStorageExtraInfo,
-    pub last_paid: u32,
-    pub due_payment: Option<Coins>,
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub struct AccountStorage {
-    pub last_tx_lt: u64,
-    pub balance: CurrencyCollection,
-    pub state: AccountState,
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub enum MaybeStorageExtraInfo {
-    None(StorageExtraInfoNone),
-    Info(StorageExtraInfo),
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b000, bits_len = 3)]
-pub struct StorageExtraInfoNone;
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b001, bits_len = 3)]
-pub struct StorageExtraInfo {
-    pub dict_hash: TonHash,
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub enum AccountState {
-    Uninit(AccountStateUninit),
-    Frozen(AccountStateFrozen),
-    Active(AccountStateActive),
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b00, bits_len = 2)]
-pub struct AccountStateUninit;
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b01, bits_len = 2)]
-pub struct AccountStateFrozen {
-    pub state_hash: TonHash,
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b1, bits_len = 1)]
-pub struct AccountStateActive {
-    pub state_init: StateInit,
-}
-
-// https://github.com/ton-blockchain/ton/blob/ed4682066978f69ffa38dd98912ca77d4f660f66/crypto/block/block.tlb#L271
-#[derive(Debug, Clone, PartialEq, TLB)]
-pub enum AccountStatus {
-    Uninit(AccountStatusUninit),
-    Frozen(AccountStatusFrozen),
-    Active(AccountStatusActive),
-    NonExist(AccountStatusNotExist),
-}
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b00, bits_len = 2)]
-pub struct AccountStatusUninit;
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b01, bits_len = 2)]
-pub struct AccountStatusFrozen;
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b10, bits_len = 2)]
-pub struct AccountStatusActive;
-
-#[derive(Debug, Clone, PartialEq, TLB)]
-#[tlb(prefix = 0b11, bits_len = 2)]
-pub struct AccountStatusNotExist;
-
 impl ShardAccount {
     pub const NON_EXIST: ShardAccount = ShardAccount {
         account: MaybeAccount::None(AccountNone),
@@ -126,10 +41,6 @@ impl ShardAccount {
     };
 }
 
-impl Default for AccountStatus {
-    fn default() -> Self { AccountStatus::NonExist(AccountStatusNotExist) }
-}
-
 impl Default for MaybeAccount {
     fn default() -> Self { MaybeAccount::None(AccountNone) }
 }
@@ -152,14 +63,16 @@ impl MaybeAccount {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::block_tlb::{SimpleLib, TickTock};
+    use crate::block_tlb::{CurrencyCollection, SimpleLib, StateInit, TickTock};
     use std::collections::HashMap;
 
+    use crate::block_tlb::account_types::account_state::AccountState;
+    use crate::block_tlb::account_types::account_storage::{StorageExtraInfoNone, StorageUsed};
     use std::str::FromStr;
     use tokio_test::assert_ok;
     use ton_lib_core::cell::TonCell;
     use ton_lib_core::traits::tlb::TLB;
-    use ton_lib_core::types::tlb_core::{MsgAddressIntStd, VarLen};
+    use ton_lib_core::types::tlb_core::{MsgAddressIntStd, VarLen, VarLenBytes};
 
     #[test]
     fn test_block_tlb_account_some() -> anyhow::Result<()> {