Skip to content

Commit

Permalink
Merge branch 'main' of github.com:PayneJoe/PNova into main
Browse files Browse the repository at this point in the history
  • Loading branch information
PayneJoe committed Nov 24, 2023
2 parents 9bd86fa + a0a634a commit 89b6323
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.*.sw*
.DS_Store
.idea
.vscode
/target
cargo-system-config.toml
Cargo.lock
Expand Down
10 changes: 0 additions & 10 deletions .vscode/settings.json

This file was deleted.

24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
CARGO = cargo

UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
CARGO += --config 'build.rustdocflags = ["-C", "link-args=-framework CoreFoundation -framework Security"]'
endif

help: ## Display this help screen
@grep -h \
-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

clippy: ## Run clippy checks over all workspace members and formated correctly
@cargo check
@cargo fmt --all -- --check
@cargo clippy --all-targets -- -D warnings

fix: ## Automatically apply lint suggestions. This flag implies `--no-deps` and `--all-targets`
@cargo clippy --fix

test: ## Run tests for all the workspace members
@cargo test --release --all

.PHONY: clippy fmt test
1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2023-07-13
3 changes: 3 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#![allow(unused_imports)]// remove this later.
#![allow(non_snake_case, unused)]
#![allow(clippy::too_many_arguments)]
pub mod circuit;
pub mod errors;
pub mod nifs;
Expand Down
7 changes: 2 additions & 5 deletions src/plonk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
///
use crate::errors::NovaError;
use crate::traits::Group;
use crate::{Commitment};
use crate::Commitment;

// arkworks




use ark_std::{marker::PhantomData};
use ark_std::marker::PhantomData;

// // jellyfish
// use jf_plonk::{
Expand Down

0 comments on commit 89b6323

Please sign in to comment.