Merge pull request #38 from tonlabs/fix_for_types

fix for types

Author: Denis K

ton-node-se/ton_node/src/node_engine/block_builder.rs

@@ -54,13 +54,13 @@ struct BlockData {
 impl BlockData {
     fn insert_serialized_in_msg(&mut self, msg_cell: &Cell, fees: &ImportFees ) -> Result<()> {
         let mut in_msg_dscr = self.block_extra.read_in_msg_descr()?;
-        in_msg_dscr.insert_serialized(&msg_cell.repr_hash().write_to_new_cell()?.into(), &msg_cell.into(), fees)?;
+        in_msg_dscr.insert_serialized(&msg_cell.repr_hash().serialize()?.into(), &msg_cell.into(), fees)?;
         self.block_extra.write_in_msg_descr(&in_msg_dscr)
     }
 
     fn insert_serialized_out_msg(&mut self, msg_cell: &Cell, exported: &CurrencyCollection) -> Result<()> {
         let mut out_msg_descr = self.block_extra.read_out_msg_descr()?;
-        out_msg_descr.insert_serialized(&msg_cell.repr_hash().write_to_new_cell()?.into(), &msg_cell.into(), exported)?;
+        out_msg_descr.insert_serialized(&msg_cell.repr_hash().serialize()?.into(), &msg_cell.into(), exported)?;
         self.block_extra.write_out_msg_descr(&out_msg_descr)
     }
 }

ton-node-se/ton_node/src/node_engine/blocks_finality.rs

@@ -9,7 +9,7 @@ use std::io::{ErrorKind, Read, Seek, Write};
 use std::path::PathBuf;
 use ton_block::{InMsg, OutMsg, AccountStatus, ExtOutMessageHeader, MsgEnvelope};
 use ton_block::{HashmapAugType, BlkPrevInfo, Deserializable, ShardIdent};
-use ton_types::{UInt256, deserialize_tree_of_cells, BagOfCells, BuilderData};
+use ton_types::{UInt256, deserialize_tree_of_cells, BagOfCells};
 
 #[cfg(test)]
 #[path = "../../../tonos-se-tests/unit/test_block_finality.rs"]
@@ -102,7 +102,7 @@ debug!("FINBLK {:?}", hashes);
                     hash: sb.block_hash.clone(),
                 };
                 let mut shard = vec![];
-                BagOfCells::with_root(&sb.shard_state.write_to_new_cell()?.into())
+                BagOfCells::with_root(&sb.shard_state.serialize()?)
                     .write_to(&mut shard, false)?;
                 // save shard state
                 self.shard_state_storage.save_serialized_shardstate_ex(
@@ -352,9 +352,9 @@ debug!("FINBLK {:?}", hashes);
         if !is_sync {
             if let Some(db) = self.db.clone() {
 
-                // let block_root = block.write_to_new_cell()?.into();
-                // let state_root = shard_state.write_to_new_cell()?.into();
-                // let block_info_root = block.read_info()?.write_to_new_cell()?;
+                // let block_root = block.serialize()?;
+                // let state_root = shard_state.serialize()?;
+                // let block_info_root = block.read_info()?.serialize()?;
                 // let block_info_cells = BagOfCells::with_root(&block_info_root.into())
                 //     .withdraw_cells();
 
@@ -594,7 +594,7 @@ debug!(target: "node", "PUT-BLOCK-HASH {:?}", sb.block_hash);
     /// get number of last finalized shard
     fn get_last_finality_shard_hash(&self) -> NodeResult<(u64, UInt256)> {
         // TODO avoid serilization there
-        let cell: Cell = self.last_finalized_block.shard_state.write_to_new_cell()?.into();
+        let cell = self.last_finalized_block.shard_state.serialize()?;
 
         Ok((self.last_finalized_block.seq_no, cell.repr_hash()))
     }
@@ -719,9 +719,8 @@ impl ShardBlock {
         // Test-lite-client requires hash od unsigned block
         // TODO will to think, how to do better
         let mut block_data = vec![];
-        let mut builder = BuilderData::new();
-        sblock.block().write_to(&mut builder).unwrap(); // TODO process result
-        let bag = BagOfCells::with_root(&builder.into());
+        let cell = sblock.block().serialize().unwrap(); // TODO process result
+        let bag = BagOfCells::with_root(&cell);
         bag.write_to(&mut block_data, false).unwrap(); // TODO process result
 
         let mut hasher = Sha256::new();
@@ -747,7 +746,7 @@ impl ShardBlock {
         buf.append(&mut self.block_hash.as_slice().to_vec());
         buf.append(&mut self.file_hash.as_slice().to_vec());
 
-        BagOfCells::with_root(&self.shard_state.write_to_new_cell()?.into())
+        BagOfCells::with_root(&self.shard_state.serialize()?)
             .write_to(&mut buf, false)?;
 
         let mut block_buf = Vec::new();
@@ -852,7 +851,7 @@ pub(crate) fn generate_block_with_seq_no(shard_ident: ShardIdent, seq_no: u32, p
                 let mut outmsg2 = Message::with_ext_out_header(eomh);
                 *outmsg2.body_mut() = Some(SliceData::new(vec![0x02;120]));
 
-                let tr_cell: Cell = transaction.write_to_new_cell().unwrap().into();
+                let tr_cell = transaction.serialize().unwrap();
 
                 let out_msg1 = OutMsg::new(
                     &MsgEnvelope::with_message_and_fee(&outmsg1, 9u32.into()).unwrap(),

ton-node-se/ton_node/src/node_engine/file_based_storage.rs

@@ -333,9 +333,9 @@ impl ShardStateStorage for FileBasedStorage {
         let (mut shard_path, _blocks_path, _tr_dir) = Self::create_default_shard_catalog(shard_dir, &self.shard_ident)?;
         shard_path.push("shard_state.block");
 
-        let builder = shard_state.write_to_new_cell()?;
+        let cell = shard_state.serialize()?;
         let mut file = File::create(shard_path.as_path())?;
-        serialize_tree_of_cells(&builder.into(), &mut file)?;
+        serialize_tree_of_cells(&cell, &mut file)?;
         file.flush()?;
         Ok(())
     }
@@ -364,8 +364,8 @@ impl ShardStateStorage for FileBasedStorage {
         if shard_data.is_some() {
             file.write_all(shard_data.unwrap().as_slice())?;
         } else {
-            let builder = shard_state.write_to_new_cell()?;
-            serialize_tree_of_cells(&builder.into(), &mut file)?;
+            let cell = shard_state.serialize()?;
+            serialize_tree_of_cells(&cell, &mut file)?;
         }
         file.flush()?;
 

ton-node-se/ton_node/src/node_engine/messages.rs

@@ -461,7 +461,7 @@ info!(target: "profiler",
 
     fn get_out_msgs_from_transaction(shard_id: &ShardIdent, transaction: &Transaction, reimport: &InMsg) -> NodeResult<Vec<OutMsg>> {
         let mut res = vec![];
-        let tr_cell: Cell = transaction.write_to_new_cell()?.into();
+        let tr_cell = transaction.serialize()?;
         transaction.iterate_out_msgs(|ref msg| {
             res.push(if msg.is_internal() {
                 if shard_id.contains_address(&msg.dst().unwrap())? {

ton-node-se/ton_node/src/node_engine/mod.rs

@@ -304,7 +304,7 @@ impl StubReceiver {
         );
 
         *msg.body_mut() = Some(Self::create_transfer_int_header(workchain_id, src, dst, value)
-            .write_to_new_cell()
+            .serialize()
             .unwrap()
             .into()
         );

ton-node-se/ton_node/src/node_engine/ton_node_handlers.rs

@@ -1030,7 +1030,7 @@ time.push(now.elapsed().as_micros());
         self.sync_limit.store(0, AtomicOrdering::SeqCst);
     }
 
-    ///  stop synchronization
+    ///  start synchronization
     fn start_sync(&self) -> bool {
         let res = self.is_synchronize.compare_exchange(false, true, AtomicOrdering::SeqCst, AtomicOrdering::SeqCst);
         info!(target: "node", "Start synchronization = {}!", res.is_ok());