Merge branch 'master' of github.com:darkrenaissance/darkfi into dao_demo

This commit is contained in:
lunar-mining
2022-09-08 08:38:57 +02:00
33 changed files with 729 additions and 238 deletions

View File

@@ -54,14 +54,14 @@ fix: token_lists zkas $(PROOFS_BIN)
clippy: token_lists zkas $(PROOFS_BIN)
RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) clippy --release --all-features --all
rustdoc: token_lists
rustdoc: token_lists zkas
RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) doc --release --workspace --all-features \
--no-deps --document-private-items
test: token_lists zkas $(PROOFS_BIN) test-tx
RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) test --release --all-features --all
test-tx:
test-tx: zkas
RUSTFLAGS="$(RUSTFLAGS)" $(CARGO) run --release --features=node,zkas --example tx
clean: