Skip to content

Commit 6ce2022

Browse files
joyqvqjonas-lj
andauthored
update fastcrypto version (#850)
* update fastcrypto version * fix cargo deny according to sui * partial lint fixes * add experimental flag * remove unused test * remove bench * Avoid type bound on multiple locations --------- Co-authored-by: Jonas Lindstrøm <[email protected]>
1 parent 3bbbcac commit 6ce2022

File tree

26 files changed

+245
-362
lines changed

26 files changed

+245
-362
lines changed

.cargo/config

Lines changed: 0 additions & 10 deletions
This file was deleted.

.cargo/config.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[alias]
2+
# Collection of project wide clippy lints. This is done via an alias because
3+
# clippy doesn't currently allow for specifiying project-wide lints in a
4+
# configuration file. This is a similar workaround to the ones presented here:
5+
# <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
6+
xclippy = [
7+
"clippy", "--all-targets", "--all-features", "--",
8+
"-Wclippy::all",
9+
"-Wclippy::disallowed_methods",
10+
"-Aclippy::unnecessary_get_then_check",
11+
]
12+
xlint = "run --package x --bin x -- lint"
13+
xtest = "run --package x --bin x -- external-crates-tests"
14+
15+
# Configuration specifically for running clippy on `external-crates/move/`.
16+
# Some of these allows are to avoid code churn; others are filed as issues on the `sui` repo now.
17+
move-clippy = [
18+
"clippy",
19+
"--all-targets",
20+
"--",
21+
"-Wclippy::all",
22+
"-Wclippy::disallowed_methods",
23+
"-Aclippy::upper_case_acronyms",
24+
"-Aclippy::type_complexity",
25+
"-Aclippy::new_without_default",
26+
"-Aclippy::question_mark",
27+
"-Aclippy::unnecessary_get_then_check",
28+
"-Aclippy::needless_borrows_for_generic_args",
29+
]
30+
31+
[build]
32+
rustflags = ["-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes"]

.github/workflows/rust.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,6 @@ jobs:
9292
name: cargo-deny (advisories, licenses, bans, ...)
9393
runs-on: ubuntu-latest
9494
steps:
95-
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3
96-
- uses: EmbarkStudios/cargo-deny-action@e0a440755b184aa50374330fa75cca0f84fcb59a # pin@v1
95+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
96+
- uses: taiki-e/install-action@cargo-deny
97+
- run: cargo deny check bans licenses sources

Cargo.lock

Lines changed: 8 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deny.toml

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,28 @@
99
# The values provided in this template are the default values that will be used
1010
# when any section or field is not specified in your own configuration
1111

12-
# If 1 or more target triples (and optionally, target_features) are specified,
13-
# only the specified targets will be checked when running `cargo deny check`.
14-
# This means, if a particular package is only ever used as a target-specific
15-
# dependency, such as, for example, the `nix` crate only being used via the
16-
# `target_family = "unix"` configuration, that only having windows targets in
17-
# this list would mean the nix crate, as well as any of its exclusive
18-
# dependencies not shared by any other crates, would be ignored, as the target
19-
# list here is effectively saying which targets you are building for.
20-
targets = [
21-
# The triple can be any string, but only the target triples built into
22-
# rustc (as of 1.40) can be checked against actual config expressions
23-
#{ triple = "x86_64-unknown-linux-musl" },
24-
# You can also specify which target_features you promise are enabled for a
25-
# particular target. target_features are currently not validated against
26-
# the actual valid features supported by the target architecture.
27-
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
28-
]
29-
3012
# This section is considered when running `cargo deny check advisories`
3113
# More documentation for the advisories section can be found here:
3214
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
3315
[advisories]
16+
version = 2
3417
# The path where the advisory database is cloned/fetched into
3518
db-path = "~/.cargo/advisory-db"
3619
# The url(s) of the advisory databases to use
3720
db-urls = ["https://github.com/rustsec/advisory-db"]
38-
# The lint level for security vulnerabilities
39-
vulnerability = "deny"
40-
# The lint level for unmaintained crates
41-
unmaintained = "warn"
42-
# The lint level for crates that have been yanked from their source registry
43-
yanked = "warn"
44-
# The lint level for crates with security notices. Note that as of
45-
# 2019-12-17 there are no security notice advisories in
46-
# https://github.com/rustsec/advisory-db
47-
notice = "warn"
4821
# A list of advisory IDs to ignore. Note that ignored advisories will still
4922
# output a note when they are encountered.
5023
ignore = [
5124
#"RUSTSEC-0000-0000",
5225
"RUSTSEC-2023-0071",
53-
# reqwest uses unpatched rustls (also in Sui)
54-
"RUSTSEC-2024-0336",
26+
# allow unmaintained proc-macro-error used in transitive dependencies (also in Sui)
27+
"RUSTSEC-2024-0370",
28+
# allow unmaintained instant crate used in transitive dependencies (backoff, cached, fastrand, parking_lot_*, also in Sui)
29+
"RUSTSEC-2024-0384",
30+
# allow outdated 'idna' until passkey-client crate is able to update (also in Sui)
31+
"RUSTSEC-2024-0421",
32+
# allow unmaintained derivative crate used in transitive dependencies (ark-*, also in Sui)
33+
"RUSTSEC-2024-0388",
5534
]
5635
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
5736
# lower than the range specified will be ignored. Note that ignored advisories
@@ -67,43 +46,26 @@ ignore = [
6746
# More documentation for the licenses section can be found here:
6847
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
6948
[licenses]
70-
# The lint level for crates that do not have a detectable license
71-
unlicensed = "deny"
49+
version = 2
7250
# List of explicitly allowed licenses
7351
# See https://spdx.org/licenses/ for list of possible licenses
7452
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
7553
allow = [
7654
"MIT",
7755
"BSD-2-Clause",
7856
"BSD-3-Clause",
79-
"CC0-1.0",
8057
"Apache-2.0",
81-
"LicenseRef-ring",
58+
"MPL-2.0",
8259
"ISC",
60+
"CC0-1.0",
61+
"0BSD",
62+
"LicenseRef-ring",
63+
"Unlicense",
64+
"BSL-1.0",
8365
"Unicode-DFS-2016",
84-
"Apache-2.0 WITH LLVM-exception",
85-
"0BSD"
86-
]
87-
# List of explicitly disallowed licenses
88-
# See https://spdx.org/licenses/ for list of possible licenses
89-
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
90-
deny = [
91-
#"Nokia",
66+
"Unicode-3.0",
67+
#"Apache-2.0 WITH LLVM-exception",
9268
]
93-
# Lint level for licenses considered copyleft
94-
copyleft = "warn"
95-
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
96-
# * both - The license will be approved if it is both OSI-approved *AND* FSF
97-
# * either - The license will be approved if it is either OSI-approved *OR* FSF
98-
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
99-
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
100-
# * neither - This predicate is ignored and the default lint level is used
101-
allow-osi-fsf-free = "neither"
102-
# Lint level used when no other predicates are matched
103-
# 1. License isn't in the allow or deny lists
104-
# 2. License isn't copyleft
105-
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
106-
default = "deny"
10769
# The confidence threshold for detecting a license from license text.
10870
# The higher the value, the more closely the license text must be to the
10971
# canonical license text of a valid SPDX license file.

fastcrypto-tbls/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ hex = "0.4.3"
2525
tap = { version = "1.0.1", features = [] }
2626

2727
[dev-dependencies]
28-
criterion = "0.4.0"
28+
criterion = "0.5.1"
2929
generic-tests = "0.1.2"
3030

3131
[[bench]]
@@ -47,3 +47,4 @@ harness = false
4747

4848
[features]
4949
default = []
50+
experimental = []

0 commit comments

Comments
 (0)