Clean up crates and imports

Cargo.toml

@@ -12,8 +12,8 @@ license = "MIT License"
 [dependencies]
 rand = "0.6"
 rand_core = "0.4.0"
-ff = { git = "https://github.com/boltlabs-inc/ff", branch = "master" }
-pairing = { git = "https://github.com/boltlabs-inc/pairing", branch = "master", features = ["serde"] }
+ff_bl = { git = "https://github.com/boltlabs-inc/ff", branch = "master" }
+pairing_bl = { git = "https://github.com/boltlabs-inc/pairing", branch = "master", features = ["serde"] }
 libc = "*"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

README.md

@@ -40,9 +40,7 @@ We will switch to the stable release channel once libbolt (and dependencies) are
 
 # Build & Install
 
-Please ensure you have installed the libsodium library for your platform. See install instructions [here](https://download.libsodium.org/doc/installation/index.html).
-
-To build the library and execute basic examples, run `make` 
+To build the library in debug, execute tests and basic examples, run `make` 
 
 # Tests
 

examples/bolt_test.rs

@@ -1,8 +1,8 @@
 extern crate rand;
 extern crate rand_core;
 extern crate bolt;
-extern crate ff;
-extern crate pairing;
+extern crate ff_bl as ff;
+extern crate pairing_bl as pairing;
 extern crate time;
 extern crate secp256k1;
 

src/ccs08.rs

@@ -4,11 +4,9 @@ Efficient Protocols for Set Membership and Range Proofs
 Jan Camenisch, Rafik Chaabouni, and abhi shelat
 Asiacrypt 2008
 */
-extern crate pairing;
-extern crate rand;
 
-use rand::Rng;
 use super::*;
+use rand::Rng;
 use cl::{Signature, PublicParams, setup, BlindKeyPair, ProofState, SignatureProof, BlindPublicKey};
 use ped92::{Commitment, CSMultiParams};
 use pairing::{Engine, CurveProjective};

src/channels.rs

@@ -1,14 +1,3 @@
-/*
- * Implement for Bolt protocols:
- * - initializing channel state and generating cust/merch wallets
- * - establish protocol
- * - pay protocol
- * - channel close algorithms (WIP)
- */
-
-extern crate pairing;
-extern crate rand;
-
 use super::*;
 use pairing::Engine;
 use cl::{BlindKeyPair, Signature};
@@ -134,8 +123,6 @@ impl<E: Engine> ChannelToken<E> {
 
     // add a method to compute hash on chain: SHA256 + RIPEMD160?
 }
-// add methods to check if channel token is initialized
-// (only if
 
 ///
 /// Channel state for generating/loading channel parameters and generating keypairs

src/cl.rs

@@ -1,8 +1,5 @@
 // cl.rs
 // CL Sigs - Pointcheval Sanders ('06)
-extern crate pairing;
-extern crate rand;
-
 use super::*;
 use pairing::{CurveProjective, Engine};
 use ff::PrimeField;

src/lib.rs

@@ -19,8 +19,8 @@
 #[cfg(all(test, feature = "unstable"))]
 extern crate test;
 
-extern crate ff;
-extern crate pairing;
+extern crate ff_bl as ff;
+extern crate pairing_bl as pairing;
 extern crate rand;
 extern crate rand_core;
 
@@ -159,10 +159,6 @@ pub mod bidirectional {
         pub signature: secp256k1::Signature,
     }
 
-    pub fn init() {
-        //sodiumoxide::init();
-    }
-
     ///
     /// init_merchant - takes as input the public params, merchant balance and keypair.
     /// Generates merchant data which consists of channel token and merchant state.

src/nizk.rs

@@ -1,6 +1,3 @@
-extern crate pairing;
-extern crate rand;
-
 use super::*;
 use rand::Rng;
 use cl::{Signature, PublicParams, setup, BlindKeyPair, SignatureProof, BlindPublicKey};

src/wallet.rs

@@ -1,5 +1,3 @@
-extern crate pairing;
-
 use super::*;
 use pairing::Engine;
 use ff::PrimeField;