Merge pull request #209 from zhangsoledad/zhangsolead/upgrade_toolchain

chore: bump rust-toolchain from 1.31.1 to 1.32.0

.travis.yml

@@ -16,15 +16,15 @@ env:
 
 matrix:
   include:
-    - rust: 1.31.1
+    - rust: 1.32.0
       os: osx
       env: FMT=true CHECK=true TEST=true
       if: type = pull_request
-    - rust: 1.31.1
+    - rust: 1.32.0
       os: osx
       env: FMT=true CHECK=true TEST=true
       if: type != pull_request
-    - rust: 1.31.1
+    - rust: 1.32.0
       os: linux
       env: TEST=true
       if: type != pull_request

README.md

@@ -32,13 +32,13 @@ The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), an
 
 ## Build dependencies
 
-CKB is currently tested mainly with `stable-1.31.1` on Linux and Mac OSX.
+CKB is currently tested mainly with `stable-1.32.0` on Linux and Mac OSX.
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/)
 
 ```bash
 # Get rustup from rustup.rs, then in your `ckb` folder:
-rustup override set 1.31.1
+rustup override set 1.32.0
 rustup component add rustfmt
 rustup component add clippy
 ```

core/src/transaction.rs

@@ -4,7 +4,6 @@ use crate::script::Script;
 use crate::BlockNumber;
 pub use crate::Capacity;
 use bincode::{deserialize, serialize};
-use ckb_util::u64_to_bytes;
 use faster_hex::hex_string;
 use hash::sha3_256;
 use numext_fixed_hash::H256;
@@ -73,7 +72,7 @@ impl CellInput {
                 0,
                 Vec::new(),
                 None,
-                Some(u64_to_bytes(block_number.to_le()).to_vec()),
+                Some(block_number.to_le_bytes().to_vec()),
                 Vec::new(),
             ),
         }

docker/hub/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:bionic as ckb-builder
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.31.1
+    RUST_VERSION=1.32.0
 
 RUN set -eux; \
     apt-get update; \

network/src/ckb_protocol.rs

@@ -115,7 +115,7 @@ where
                             IoErrorKind::Other,
                             format!("faild to upgrade ckb_protocol, error: {}", err),
                         ))
-                    }
+                    };
                 }
             };
 

network/src/ckb_service.rs

@@ -64,7 +64,7 @@ impl CKBService {
                 return Box::new(future::err(IoError::new(
                     IoErrorKind::Other,
                     format!("can't find peer {:?}", peer_id),
-                )))
+                )));
             }
         };
 

protocol/src/lib.rs

@@ -6,7 +6,6 @@ mod protocol_generated;
 
 pub use crate::protocol_generated::ckb::protocol::*;
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
-use ckb_util::u64_to_bytes;
 use hash::sha3_256;
 use numext_fixed_hash::H256;
 use siphasher::sip::SipHasher;
@@ -57,7 +56,7 @@ pub fn short_transaction_id(key0: u64, key1: u64, transaction_hash: &H256) -> Sh
     hasher.write(transaction_hash.as_bytes());
     let siphash_transaction_hash = hasher.finish();
 
-    let siphash_transaction_hash_bytes = u64_to_bytes(siphash_transaction_hash.to_le());
+    let siphash_transaction_hash_bytes = siphash_transaction_hash.to_le_bytes();
 
     let mut short_transaction_id = [0u8; 6];
 

rust-toolchain

@@ -1 +1 @@
-1.31.1
+1.32.0

src/cli/run_impl.rs

@@ -21,7 +21,6 @@ use ckb_sync::{
 use crypto::secp::Generator;
 use log::info;
 use numext_fixed_hash::H256;
-use serde_json;
 use std::sync::Arc;
 use std::thread;
 

util/src/lib.rs

@@ -1,6 +1,5 @@
 mod unstable;
 
-pub use crate::unstable::int_to_from_bytes::u64_to_bytes;
 pub use parking_lot::{
     Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, RwLockUpgradableReadGuard,
     RwLockWriteGuard,

util/src/unstable/mod.rs

@@ -1 +1 @@
-pub mod int_to_from_bytes;
+