post-rebase cleanup

taiga_halo2/Cargo.toml

@@ -4,11 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-rustler = {version = "0.29.1", optional = true}
 rand = "0.8"
 lazy_static = "1.4"
 blake2b_simd = "1.0"
-pasta_curves = { git = "https://github.com/heliaxdev/pasta_curves", branch = "taiga", features = ["repr-erlang"] }
+pasta_curves = "0.5.1"
 ff = "0.13"
 group = "0.13"
 halo2_gadgets = { git = "https://github.com/heliaxdev/halo2", branch = "taiga", features = ["test-dependencies"] }
@@ -22,6 +21,7 @@ bincode = "2.0.0-rc.3"
 byteorder = "1.4"
 num-bigint = "0.4"
 
+rustler = { version = "0.29.1", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 borsh = { version = "1.0.0-alpha.3", features = ["derive"], optional = true }
 
@@ -45,7 +45,7 @@ harness = false
 name = "tx_examples"
 
 [features]
-default = ["borsh", "serde"]
-nif = ["rustler", "pasta_curves/repr-erlang"]
+default = []
+nif = ["dep:rustler", "pasta_curves/repr-erlang"]
 serde = ["dep:serde", "pasta_curves/serde"]
 borsh = ["dep:borsh"]

taiga_halo2/src/merkle_tree.rs

@@ -1,17 +1,14 @@
 use std::hash::{Hash, Hasher};
 
+use crate::merkle_tree::LR::{L, R};
 use crate::note::NoteCommitment;
 use crate::utils::poseidon_hash;
 use crate::{constant::TAIGA_COMMITMENT_TREE_DEPTH, note::Note};
+use ff::PrimeField;
 use halo2_proofs::arithmetic::Field;
 use pasta_curves::pallas;
-use rand::{Rng, RngCore};
-
-use crate::merkle_tree::LR::{L, R};
 use rand::distributions::{Distribution, Standard};
-
-#[cfg(feature = "borsh")]
-use ff::PrimeField;
+use rand::{Rng, RngCore};
 
 #[cfg(feature = "serde")]
 use serde;

taiga_halo2/src/shielded_ptx.rs

@@ -13,6 +13,7 @@ use crate::value_commitment::ValueCommitment;
 use halo2_proofs::plonk::Error;
 use pasta_curves::pallas;
 use rand::RngCore;
+
 #[cfg(feature = "nif")]
 use rustler::{Decoder, Encoder, Env, NifResult, NifStruct, Term};
 
@@ -22,12 +23,6 @@ use serde;
 #[cfg(feature = "borsh")]
 use borsh::{BorshDeserialize, BorshSerialize};
 
-#[cfg(feature = "serde")]
-use serde;
-
-#[cfg(feature = "borsh")]
-use borsh::{BorshDeserialize, BorshSerialize};
-
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct ShieldedPartialTransaction {

taiga_halo2/src/transaction.rs

@@ -14,7 +14,7 @@ use pasta_curves::{
 use rand::{CryptoRng, RngCore};
 
 #[cfg(feature = "nif")]
-use rustler::{atoms, Decoder, Env, NifRecord, NifResult, NifStruct, Term, types::atom};
+use rustler::{atoms, types::atom, Decoder, Env, NifRecord, NifResult, NifStruct, Term};
 
 #[cfg(feature = "serde")]
 use serde;