Skip to content

Commit

Permalink
Merge pull request #559 from worldcoin/revert-557-reapply-mmapped-tree
Browse files Browse the repository at this point in the history
Revert "Reapply-mmapped-tree"
  • Loading branch information
Dzejkop authored Jul 16, 2023
2 parents b65325e + 67b0f90 commit 238f275
Show file tree
Hide file tree
Showing 20 changed files with 194 additions and 975 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- cron: '0 2 * * *' # run at 2 AM UTC

env:
RUST_VERSION: 1.70
RUST_VERSION: 1.65

jobs:
security-audit:
Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/cargo-vet.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
- main

env:
RUST_VERSION: "1.70"
NIGHTLY_VERSION: nightly-2023-05-31
RUST_VERSION: "1.65"
NIGHTLY_VERSION: nightly-2022-11-04
CARGO_TERM_COLOR: always
# Skip incremental build and debug info generation in CI
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
name: Vet Dependencies
runs-on: ubuntu-latest
env:
CARGO_VET_VERSION: 0.7.0
CARGO_VET_VERSION: 0.6.1
steps:
- uses: actions/checkout@master
- name: Install Rust
Expand Down
107 changes: 6 additions & 101 deletions Cargo.lock

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

50 changes: 10 additions & 40 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name = "signup-sequencer"
version = "0.1.0"
authors = [
"Remco Bloemen <remco@worldcoin.org>",
"Lucas Ege <lucas@worldcoin.org>",
]
"Lucas Ege <lucas@worldcoin.org>"]
edition = "2021"
build = "build.rs"
homepage = "https://github.com/worldcoin/signup-sequencer"
Expand Down Expand Up @@ -33,17 +32,9 @@ axum-server = "0.4.4"
bytes = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] }
clap = { version = "4.0", features = ["derive"] }
cli-batteries = { git = "https://github.com/recmo/cli-batteries", rev = "b8f350d9022edce2c9f7a080c6899eafda3ac9ea", features = [
"signals",
"prometheus",
"metered-allocator",
"otlp",
"datadog",
] }
cli-batteries = { git = "https://github.com/recmo/cli-batteries", rev = "b8f350d9022edce2c9f7a080c6899eafda3ac9ea", features = ["signals", "prometheus", "metered-allocator", "otlp", "datadog"] }
cognitoauth = { git = "https://github.com/lucdew/cognito-srp-auth.git" }
criterion = { version = "0.4", optional = true, features = [
"async_tokio",
] } # For `bench`
criterion = { version = "0.4", optional = true, features = ["async_tokio"] } # For `bench`
ethers = { version = "1.0.0", features = ["ws", "ipc", "openssl", "abigen"] }
eyre = "0.6"
futures = "0.3"
Expand All @@ -56,51 +47,30 @@ prometheus = "0.13.3" # We need upstream PR#465 to fix #272.
proptest = { version = "1.0", optional = true } # For `bench`
reqwest = { version = "0.11.14", features = ["json"] }
ruint = { version = "1.3", features = ["primitive-types", "sqlx"] }
semaphore = { git = "https://github.com/worldcoin/semaphore-rs", branch = "main", features = [
"depth_30",
] }
semaphore = { git = "https://github.com/worldcoin/semaphore-rs", branch = "main", features = ["depth_30"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
sqlx = { version = "0.6", features = [
"runtime-tokio-native-tls",
"any",
"postgres",
"chrono",
] }
sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "any", "postgres", "chrono"] }
take_mut = "0.2.2"
tempfile = "3.5.0"
tempfile = "3.3.0"
thiserror = "1.0"
tokio = { version = "1.17", features = [
"signal",
"macros",
"rt",
"sync",
"time",
"rt-multi-thread",
"tracing",
"test-util",
] }
tokio = { version = "1.17", features = ["signal", "macros", "rt", "sync", "time", "rt-multi-thread", "tracing", "test-util"] }
tracing = "0.1"
tracing-futures = "0.2"
url = { version = "2.2", features = ["serde"] }
zeroize = "1.6.0"
# `ethers-rs` requires an older version of primitive-types.
# But `ruint` supports the latest version. So we need to override it.
# `cargo update --package primitive-types@0.12.1 --precise 0.11.1`

[dev-dependencies]
cli-batteries = { git = "https://github.com/recmo/cli-batteries", rev = "b8f350d9022edce2c9f7a080c6899eafda3ac9ea", features = [
"mock-shutdown",
] }
cli-batteries = { git = "https://github.com/recmo/cli-batteries", rev = "b8f350d9022edce2c9f7a080c6899eafda3ac9ea", features = ["mock-shutdown"] }
hex = "0.4.3"
hex-literal = "0.4.1"
hex-literal = "0.3"
maplit = "1.0.2"
postgres-docker-utils = { path = "crates/postgres-docker-utils" }
proptest = { version = "1.0" }
regex = { version = "1.7.1", features = ["std"] }
semaphore = { git = "https://github.com/worldcoin/semaphore-rs", branch = "main", features = [
"depth_20",
] }
semaphore = { git = "https://github.com/worldcoin/semaphore-rs", branch = "main", features = ["depth_20"] }
serial_test = { version = "1.0.0" }
test-case = "3.0"
tracing-subscriber = "0.3.11"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.70 as build-env
FROM rust:1.67 as build-env
WORKDIR /src

RUN apt-get update &&\
Expand Down
Loading

0 comments on commit 238f275

Please sign in to comment.