Skip to content

Commit

Permalink
Merge pull request #185 from AleoHQ/feat/ergonomics
Browse files Browse the repository at this point in the history
[Tracking] Upgrade structs, remove duplication, refactor codebase, improve ergonomics
  • Loading branch information
howardwu committed May 31, 2021
2 parents de6b3d7 + c884868 commit 6b67667
Show file tree
Hide file tree
Showing 336 changed files with 4,103 additions and 3,198 deletions.
220 changes: 210 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ jobs:
cache_key: snarkvm-stable-cache
- run:
name: Build and run tests
no_output_timeout: 30m
no_output_timeout: 60m
command: RUST_MIN_STACK=8388608 cargo test --all
- run:
name: Build and run snarkOS integration tests
no_output_timeout: 30m
command: cd snarkos-integration && RUST_MIN_STACK=8388608 cargo test
- persist_to_workspace:
root: ~/
paths: project/
Expand Down Expand Up @@ -90,15 +86,206 @@ jobs:
cache_key: snarkvm-nightly-cache
- run:
name: Build and test
no_output_timeout: 30m
no_output_timeout: 60m
command: RUST_MIN_STACK=8388608 cargo test --all
- run:
name: Build and run snarkOS integration tests
no_output_timeout: 30m
command: cd snarkos-integration && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-nightly-cache

snarkvm-algorithms:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-algorithms-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd algorithms && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-algorithms-cache

snarkvm-curves:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-curves-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd curves && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-curves-cache

snarkvm-derives:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-derives-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd derives && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-derives-cache

snarkvm-dpc:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-dpc-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd dpc && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-dpc-cache

snarkvm-fields:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-fields-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd fields && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-fields-cache

snarkvm-gadgets:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-gadgets-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd gadgets && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-gadgets-cache

snarkvm-marlin:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-marlin-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd marlin && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-marlin-cache

snarkvm-parameters:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-parameters-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd parameters && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-parameters-cache

snarkvm-polycommit:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-polycommit-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd polycommit && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-polycommit-cache

snarkvm-posw:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-posw-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd posw && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-posw-cache

snarkvm-profiler:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-profiler-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd profiler && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-profiler-cache

snarkvm-r1cs:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-r1cs-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd r1cs && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-r1cs-cache

snarkvm-utilities:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkvm-utilities-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd utilities && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkvm-utilities-cache

workflows:
version: 2
main-workflow:
Expand All @@ -108,3 +295,16 @@ workflows:
- codecov:
requires:
- rust-stable
- snarkvm-algorithms
- snarkvm-curves
- snarkvm-derives
- snarkvm-dpc
- snarkvm-fields
- snarkvm-gadgets
- snarkvm-marlin
- snarkvm-parameters
- snarkvm-polycommit
- snarkvm-posw
- snarkvm-profiler
- snarkvm-r1cs
- snarkvm-utilities
File renamed without changes.
71 changes: 37 additions & 34 deletions objects/Cargo.toml → .integration/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "snarkvm-objects"
name = "snarkvm-integration"
version = "0.4.0"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Objects for a decentralized virtual machine"
description = "Integration testing for DPC"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/snarkVM"
keywords = [
Expand All @@ -19,62 +19,65 @@ edition = "2018"

[dependencies.snarkvm-algorithms]
path = "../algorithms"
version = "0.4.0"
default-features = false

[dependencies.snarkvm-curves]
path = "../curves"
version = "0.4.0"
default-features = false

[dependencies.snarkvm-dpc]
path = "../dpc"

[dependencies.snarkvm-fields]
path = "../fields"

[dependencies.snarkvm-gadgets]
path = "../gadgets"

[dependencies.snarkvm-parameters]
path = "../parameters"
version = "0.4.0"

[dependencies.snarkvm-profiler]
path = "../profiler"
default-features = false

[dependencies.snarkvm-r1cs]
path = "../r1cs"

[dependencies.snarkvm-utilities]
path = "../utilities"
version = "0.4.0"
default-features = false

[dependencies.anyhow]
version = "1.0"
version = "1.0.38"

[dependencies.base58]
version = "0.1"

[dependencies.bech32]
version = "0.8"

[dependencies.bincode]
version = "1.3"
version = "1.3.1"

[dependencies.blake2]
version = "0.9"

[dependencies.chrono]
version = "0.4"
features = [ "serde" ]
[dependencies.derivative]
version = "2"

[dependencies.hex]
version = "0.4.3"

[dependencies.once_cell]
version = "1.7.2"
[dependencies.itertools]
version = "0.10.0"

[dependencies.parking_lot]
version = "0.11.1"

[dependencies.rand]
version = "0.8"

[dependencies.serde]
version = "1.0"
features = [ "derive" ]

[dependencies.sha2]
version = "0.9"

[dependencies.thiserror]
version = "1.0"

[dev-dependencies.snarkvm-dpc]
path = "../dpc"

[dev-dependencies.bincode]
version = "1.3.2"

[features]
default = [
"snarkvm-algorithms/default",
"snarkvm-curves/default",
"snarkvm-utilities/default"
]
[dependencies.rand_xorshift]
version = "0.3"
File renamed without changes.

0 comments on commit 6b67667

Please sign in to comment.