wip: tl refac

Cargo.toml

@@ -1,7 +1,8 @@
 [workspace]
 resolver = "2"
 members = [
-    "tl_parser",
+    "tl-parser",
+    "tl-core",
     "tonlibjson-sys",
     "tonlibjson-client",
     "ton-grpc",

adnl-tcp/src/lib.rs

@@ -1,9 +1,5 @@
 pub mod packet;
 pub mod client;
 pub mod ping;
-pub mod types;
-pub mod serializer;
-pub mod deserializer;
-pub mod boxed;
 mod codec;
 mod key;

tl-core/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "tl-core"
+version = "0.1.0"
+edition = "2021"
+authors = ["Andrei Kostylev <[email protected]>"]
+license = "MIT"
+repository = "https://github.com/getgems-io/ton-grpc"
+description = "A toolset for Telegram Type Language"
+
+[dependencies]
+anyhow = { workspace = true }
+bytes = "1.6.0"

adnl-tcp/src/deserializer.rs → tl-core/src/deserializer.rs

@@ -1,6 +1,5 @@
 use anyhow::bail;
 use bytes::{Buf, Bytes};
-use crate::types::Int256;
 
 pub trait Deserialize where Self: Sized {
     fn deserialize(de: &mut Deserializer) -> anyhow::Result<Self>;
@@ -49,15 +48,15 @@ impl Deserializer {
         Ok(self.input.get_i64_le())
     }
 
-    pub fn parse_i256(&mut self) -> anyhow::Result<Int256> {
+    pub fn parse_i256(&mut self) -> anyhow::Result<[u8; 32]> {
         let mut needed = self.input.split_to(32);
         let mut result: [u8; 32] = [0; 32];
         needed.copy_to_slice(&mut result);
 
         Ok(result)
     }
 
-    pub fn parse_bytes(&mut self) -> anyhow::Result<crate::types::Bytes> {
+    pub fn parse_bytes(&mut self) -> anyhow::Result<Vec<u8>> {
         let len = self.input.get_u8();
         if len <= 253 {
             let mut needed = self.input.split_to(len as usize);

tl-core/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod serializer;
+pub mod deserializer;
+pub mod types;
+pub mod boxed;

adnl-tcp/src/serializer.rs → tl-core/src/serializer.rs

@@ -1,6 +1,5 @@
 use std::fmt::Debug;
 use bytes::BufMut;
-use crate::types::{Int256};
 
 pub trait Serialize {
     fn serialize(&self, se: &mut Serializer);
@@ -32,7 +31,7 @@ impl Serializer {
         self.output.put_i64_le(val)
     }
 
-    pub fn write_i256(&mut self, val: &Int256) {
+    pub fn write_i256(&mut self, val: &[u8; 32]) {
         self.output.put_slice(val)
     }
 

adnl-tcp/src/types.rs → tl-core/src/types.rs

@@ -1,6 +1,6 @@
-use crate::boxed::Boxed;
 use crate::deserializer::{Deserialize, Deserializer};
 use crate::serializer::{Serialize, Serializer};
+use crate::boxed::Boxed;
 
 pub trait Functional {
     type Result;

tl_parser/Cargo.toml → tl-parser/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
-name = "tl_parser"
+name = "tl-parser"
 version = "0.1.0"
 edition = "2021"
 authors = ["Andrei Kostylev <[email protected]>"]
+license = "MIT"
+repository = "https://github.com/getgems-io/ton-grpc"
+description = "A parser for Telegram Type Language"
 
 [dependencies]
 anyhow = { workspace = true }

ton-liteserver-client/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [build-dependencies]
-tl_parser = { path = "../tl_parser" }
+tl-parser = { path = "../tl-parser" }
 anyhow = { workspace = true }
 quote = "1.0"
 syn = "2.0.58"
@@ -13,6 +13,7 @@ convert_case = "0.6.0"
 
 [dependencies]
 adnl-tcp = { path = "../adnl-tcp" }
+tl-core = { path = "../tl-core" }
 anyhow = { workspace = true }
 tokio = { workspace = true }
 tower = { workspace = true }

ton-liteserver-client/examples/playground.rs

@@ -2,7 +2,7 @@ use std::net::{Ipv4Addr, SocketAddrV4};
 use base64::Engine;
 use tower::ServiceExt;
 use adnl_tcp::client::ServerKey;
-use adnl_tcp::types::BareType;
+use tl_core::types::BareType;
 use ton_liteserver_client::client::LiteServerClient;
 use ton_liteserver_client::tl::{LiteServerGetMasterchainInfo, LiteServerListBlockTransactions, LiteServerLookupBlock, TonNodeBlockId, True};
 

ton-liteserver-client/examples/tower.rs

@@ -4,7 +4,7 @@ use base64::Engine;
 use futures::{stream, StreamExt};
 use tower::{ServiceBuilder, ServiceExt};
 use adnl_tcp::client::ServerKey;
-use adnl_tcp::types::BareType;
+use tl_core::types::BareType;
 use ton_liteserver_client::client::LiteServerClient;
 use ton_liteserver_client::tl::{LiteServerGetMasterchainInfo, LiteServerLookupBlock, TonNodeBlockId};
 

ton-liteserver-client/src/client.rs

@@ -15,12 +15,12 @@ use thiserror::Error;
 use tokio::sync::mpsc::UnboundedSender;
 use tokio::sync::oneshot::Receiver;
 use tokio::time::MissedTickBehavior;
-use adnl_tcp::boxed::Boxed;
-use adnl_tcp::types::{BareType, BoxedType};
 use adnl_tcp::packet::Packet;
 use adnl_tcp::ping::{is_pong_packet, ping_packet};
-use adnl_tcp::deserializer::{Deserialize, from_bytes};
-use adnl_tcp::serializer::to_bytes;
+use tl_core::boxed::Boxed;
+use tl_core::types::{BareType, BoxedType};
+use tl_core::deserializer::{Deserialize, from_bytes};
+use tl_core::serializer::to_bytes;
 use crate::request::Requestable;
 use crate::tl::{AdnlMessageAnswer, AdnlMessageQuery, Bytes, Int256, LiteServerError, LiteServerQuery};
 

ton-liteserver-client/src/request.rs

@@ -1,6 +1,6 @@
-use adnl_tcp::deserializer::Deserialize;
-use adnl_tcp::serializer::Serialize;
-use adnl_tcp::types::Functional;
+use tl_core::deserializer::Deserialize;
+use tl_core::serializer::Serialize;
+use tl_core::types::Functional;
 
 pub trait Requestable: Serialize + Send {
     type Response: Deserialize + Send + 'static;

ton-liteserver-client/src/tl.rs

@@ -3,10 +3,10 @@
 
 use std::fmt::{Debug, Display, Formatter};
 use anyhow::anyhow;
-use adnl_tcp::deserializer::{Deserialize, Deserializer};
-use adnl_tcp::serializer::{Serialize, Serializer};
-use adnl_tcp::boxed::Boxed;
-pub use adnl_tcp::types::*;
+use tl_core::deserializer::{Deserialize, Deserializer};
+use tl_core::serializer::{Serialize, Serializer};
+use tl_core::boxed::Boxed;
+pub use tl_core::types::*;
 
 include!(concat!(env!("OUT_DIR"), "/generated.rs"));
 
@@ -23,9 +23,9 @@ impl std::error::Error for LiteServerError {
 #[cfg(test)]
 mod tests {
     use base64::Engine;
-    use adnl_tcp::boxed::Boxed;
-    use adnl_tcp::deserializer::from_bytes;
-    use adnl_tcp::serializer::to_bytes;
+    use tl_core::boxed::Boxed;
+    use tl_core::deserializer::from_bytes;
+    use tl_core::serializer::to_bytes;
     use super::*;
 
     #[test]

tonlibjson-client/Cargo.toml

@@ -40,7 +40,7 @@ tracing-test = { workspace = true }
 serial_test = "3.0.0"
 
 [build-dependencies]
-tl_parser = { path = "../tl_parser" }
+tl-parser = { path = "../tl-parser" }
 anyhow = { workspace = true }
 quote = "1.0"
 syn = "2.0.60"