Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump rust-toolchain from 1.31.1 to 1.32.0 #209

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
3 changes: 1 addition & 2 deletions core/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
),
}
Expand Down
2 changes: 1 addition & 1 deletion docker/hub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion network/src/ckb_protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ where
IoErrorKind::Other,
format!("faild to upgrade ckb_protocol, error: {}", err),
))
}
};
}
};

Expand Down
2 changes: 1 addition & 1 deletion network/src/ckb_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl CKBService {
return Box::new(future::err(IoError::new(
IoErrorKind::Other,
format!("can't find peer {:?}", peer_id),
)))
)));
}
};

Expand Down
3 changes: 1 addition & 2 deletions protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.31.1
1.32.0
1 change: 0 additions & 1 deletion src/cli/run_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion util/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
19 changes: 0 additions & 19 deletions util/src/unstable/int_to_from_bytes.rs

This file was deleted.

2 changes: 1 addition & 1 deletion util/src/unstable/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pub mod int_to_from_bytes;