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

build: toolchain update to 1.80.1 #275

Merged
merged 2 commits into from
Aug 31, 2024
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
50 changes: 25 additions & 25 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,30 @@ jobs:

strategy:
matrix:
rust-version: [1.79.0]
rust-version: [ 1.80.1 ]

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Cache Cargo dependencies
uses: actions/cache@v2
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: Install Protoc
uses: arduino/setup-protoc@v1
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust-version }}
- name: Check formatting
run: cargo fmt -- --check
- name: cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --workspace --all-targets --tests -- -D warnings
- name: Build and test
run: cargo test --all-features
- name: Checkout code
uses: actions/checkout@v2
- name: Cache Cargo dependencies
uses: actions/cache@v2
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-
- name: Install Protoc
uses: arduino/setup-protoc@v1
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust-version }}
- name: Check formatting
run: cargo fmt -- --check
- name: cargo clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --workspace --all-targets --tests -- -D warnings
- name: Build and test
run: cargo test --all-features
25 changes: 23 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions anychain-filecoin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "anychain-filecoin"
description = "A Rust library for Filecoin-focused cryptocurrency wallets, enabling seamless transactions on the Filecoin blockchain"
version = "0.1.7"
version = "0.1.8"
keywords = ["filecoin", "blockchain", "cryptocurrencies", "wallet", "transactions"]

# Workspace inherited keys
Expand Down Expand Up @@ -33,4 +33,10 @@ forest_encoding = { workspace = true }
cid = { workspace = true }
base64 = { workspace = true }
libsecp256k1 = { workspace = true }
bls-signatures = { workspace = true }
bls-signatures = { workspace = true }
arbitrary = { version = "1.3.2", features = ["derive"], optional = true }

[features]
default = ["std"]
std = ["anychain-core/std"]
arb = ["dep:arbitrary"]
1 change: 0 additions & 1 deletion anychain-filecoin/src/address.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ use thiserror::Error;

/// Represents a filecoin address
#[derive(PartialEq, Eq, Clone, Debug, Hash, Copy, Default)]
#[cfg_attr(feature = "testing", derive(Default))]
#[cfg_attr(feature = "arb", derive(arbitrary::Arbitrary))]
pub struct FilecoinAddress {
network: Network,
Expand Down
12 changes: 10 additions & 2 deletions anychain-kms/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "anychain-kms"
description = "A Rust library providing Key Management Schema for AnyChain. Handles general security and signature algorithms."
version = "0.1.11"
version = "0.1.12"
keywords = ["cryptography", "security", "signature", "algorithm"]

# Workspace inherited keys
Expand Down Expand Up @@ -36,6 +36,14 @@ encoding = "0.2.33"
hex-literal = "0.4"

[features]
default = ["std"]
alloc = ["zeroize/alloc"]
std = ["alloc"]
chinese-simplified = []
chinese-traditional = []
# Note: English is the standard for bip39 so always included
french = []
italian = []
japanese = []
korean = []
spanish = []
default = ["std", "chinese-simplified", "chinese-traditional", "french", "italian", "japanese", "korean", "spanish"]
7 changes: 6 additions & 1 deletion anychain-kms/src/bip39/language.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,13 @@ impl Language {
pub fn from_language_code(language_code: &str) -> Option<Self> {
match &language_code.to_ascii_lowercase()[..] {
"en" => Some(Language::English),
#[cfg(feature = "chinese-simplified")]
"zh-hans" => Some(Language::ChineseSimplified),
#[cfg(feature = "chinese-simplified")]
"zh-cn" => Some(Language::ChineseSimplified),
#[cfg(feature = "chinese-traditional")]
"zh-hant" => Some(Language::ChineseTraditional),
#[cfg(feature = "chinese-traditional")]
"zh-tw" => Some(Language::ChineseTraditional),
#[cfg(feature = "french")]
"fr" => Some(Language::French),
Expand Down Expand Up @@ -244,7 +249,7 @@ mod test {
assert!(res.is_empty());
}

fn _is_wordlist_nfkd(wl: &WordList) -> bool {
fn is_wordlist_nfkd(wl: &WordList) -> bool {
for idx in 0..2047 {
let word = wl.get_word(idx.into());
if !unicode_normalization::is_nfkd(word) {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.79.0"
channel = "1.80.1"
components = ["clippy", "rustfmt"]
targets = []
profile = "minimal"
Loading