0.7.50 (#28)

Cargo.toml

@@ -1,39 +1,37 @@
-
 [package]
-
-edition = '2018'
-build = './common/build/build.rs'
-name = 'rldp'
-version = '0.7.49'
-description = 'RLDP library'
+edition = "2018"
+build = "./common/build/build.rs"
+name = "rldp"
+version = "0.7.50"
+description = "RLDP library"
+resolver = "2"
 
 [workspace]
 
 [dependencies]
-
-async-trait = '0.1.22'
-base64 = '0.11.0'
-failure = '0.1.6'
-log = '0.4.8'
-rand = '0.7.2'
-raptorq = { version = '1.2.1', path = 'raptorq' }
-tokio = { version = '1.5.0', features = [ 'rt-multi-thread' ] }
-lockfree = { git = 'https://github.com/tonlabs/lockfree.git' }
-adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', features = [ 'node' ], tag = '0.7.53' }
-ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl.git', package = 'ton_api', tag = '0.2.110' }
-ton_types = { git = 'https://github.com/tonlabs/ton-labs-types.git', tag = '1.10.10' }
+async-trait = "0.1"
+base64 = "0.13"
+failure = "0.1"
+log = "0.4"
+rand = "0.7"
+raptorq = { version = "1.2.1", path = "raptorq" }
+tokio = { version = "1.5", features = ["rt-multi-thread"] }
+
+lockfree = { git = "https://github.com/tonlabs/lockfree.git" }
+adnl = { git = 'https://github.com/tonlabs/ton-labs-adnl', features = [ 'node' ], tag = '0.7.55' }
+ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl.git', package = 'ton_api', tag = '0.2.111' }
+ton_types = { git = 'https://github.com/tonlabs/ton-labs-types.git', tag = '1.10.11' }
 
 [dev-dependencies]
-
-arrayref = '0.3.5'
-external-ip = '4.1.0'
-hex = '^0'
-log4rs = '0.8.3'
-overlay = { git = 'https://github.com/tonlabs/ton-labs-overlay.git' }
-serde_json = '1.0.41'
-sha2 = '0.8.0'
+external-ip = "4.1"
+hex = "0.4"
+log4rs = "1.0"
+overlay = { git = "https://github.com/tonlabs/ton-labs-overlay.git", tag = '0.6.35' }
+serde_json = "1.0"
+sha2 = "0.9"
 
 [features]
+compression = ["adnl/compression"]
+telemetry = ["adnl/telemetry"]
+telemetry_test_only = ["adnl/telemetry", "overlay/telemetry"]
 
-compression = [ 'adnl/compression' ]
-telemetry = [ 'adnl/telemetry' ]

raptorq/Cargo.toml

@@ -1,43 +1,34 @@
-
 [package]
-
-edition = '2018'
-name = 'raptorq'
-description = 'RaptorQ (RFC6330), forked from https://github.com/cberner/raptorq'
-version = '1.2.1'
-authors = [ 'Christopher Berner <christopherberner@gmail.com>' ]
+edition = "2018"
+name = "raptorq"
+description = "RaptorQ (RFC6330), forked from https://github.com/cberner/raptorq"
+version = "1.2.1"
+authors = ["Christopher Berner <christopherberner@gmail.com>"]
 
 [dependencies]
-
-serde = { version = '1.0.102', features = [ 'std', 'derive' ] }
+serde = {version = "1.0.102", features=["std", "derive"]}
 
 [dev-dependencies]
-
-criterion = '0.3'
-primal = '0.2'
-rand = '0.7'
-threadpool = '1.7'
+criterion = "0.3"
+primal = "0.2"
+rand = "0.7"
+threadpool = "1.7"
 
 [[bench]]
-
-name = 'codec_benchmark'
+name = "codec_benchmark"
 harness = false
 
 [[bench]]
-
-name = 'matrix_sparsity'
+name = "matrix_sparsity"
 harness = false
 
 [[bench]]
-
-name = 'encode_benchmark'
+name = "encode_benchmark"
 harness = false
 
 [[bench]]
-
-name = 'decode_benchmark'
+name = "decode_benchmark"
 harness = false
 
-[features]
-
-benchmarking = [ ]
+[features] 
+benchmarking = []

src/lib.rs

@@ -2,8 +2,8 @@ use adnl::{
  declare_counted, dump, 
  common::{
  add_counted_object_to_map, add_unbound_object_to_map, deserialize, get256, AdnlPeers, 
- CountedObject, Counter, KeyId, Query, QueryId, serialize, serialize_boxed_inplace, Subscriber,
- TaggedByteSlice, Version
+ CountedObject, Counter, KeyId, Query, QueryId, serialize, serialize_unboxed_inplace, 
+ Subscriber, TaggedByteSlice, Version
  },
  node::AdnlNode
 };
@@ -190,7 +190,7 @@ impl RecvTransfer {
  confirm.part = message.part;
  confirm.seqno = max_seqno as i32;
  self.confirm_count = 0;
- serialize_boxed_inplace(&mut self.buf, &self.confirm)?;
+ serialize_unboxed_inplace(&mut self.buf, &self.confirm)?;
  let ret = TaggedByteSlice {
  object: &self.buf[..],
  #[cfg(feature = "telemetry")]
@@ -205,7 +205,7 @@ impl RecvTransfer {
 
  fn build_part_completed_reply(&mut self, part: i32) -> Result<Option<TaggedByteSlice>> {
  self.complete_mut()?.part = part;
- serialize_boxed_inplace(&mut self.buf, &self.complete)?;
+ serialize_unboxed_inplace(&mut self.buf, &self.complete)?;
  let ret = TaggedByteSlice {
  object: &self.buf[..],
  #[cfg(feature = "telemetry")]
@@ -376,7 +376,7 @@ impl <'a> SendTransfer<'a> {
  }
  self.state.set_seqno_sent(seqno_sent);
  }
- serialize_boxed_inplace(&mut self.buf, &self.message)?;
+ serialize_unboxed_inplace(&mut self.buf, &self.message)?;
  Ok(&self.buf[..]) 
  } else {
  fail!("Encoder is not ready");