#20 Upgrade to consume latest rerypt-rs version and bump to Rust 1.31 (#21)

Author: ernieturner

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 rust:
-    - 1.30.0
+    - 1.31.0
 
 # all unlabeled jobs run at test. Only if all "test" jobs finish, will the publish job run
 stages:

RELEASING.md

@@ -0,0 +1,7 @@
+Release Checklist
+=================
+
+* Decide on the new version number and update it within the `package.json` file. This will be used as the NPM version number.
+* Write the CHANGELOG.md entry for the release by looking at the PRs.
+* Commit `package.json` (for version number) and `CHANGELOG.md`.
+* Push a tag for the version that exists in the `package.json` using `git tag {version}` and `git push origin {tag}`. Pushing this tag will cause Travis to build the Node bindings for all currently supported platforms to verify that they build correctly. If they do, it will then perform the NPM publish step within TravisCI via the `publish.js` script.

native/Cargo.toml

@@ -8,10 +8,9 @@ name = "recrypt_node"
 crate-type = ["dylib"]
 
 [dependencies]
-rand = "0.5.5"
-#recrypt = "0.3.0"
-recrypt = { git = "https://github.com/IronCoreLabs/recrypt-rs"}
-neon = "0.2.0"
+rand = "~0.6.1"
+recrypt = { git = "https://github.com/IronCoreLabs/recrypt-rs", tag = "0.5.1"}
+neon = "~0.2.0"
 
 [build-dependencies]
 neon-build = "0.2.0"

native/src/api256.rs

@@ -9,7 +9,7 @@ use recrypt::api::{
 use util;
 
 pub struct RecryptApi256 {
-    api: Api<Sha256, Ed25519, RandomBytes<rand::ThreadRng>>,
+    api: Api<Sha256, Ed25519, RandomBytes<rand::rngs::ThreadRng>>,
 }
 
 declare_types! {
@@ -310,7 +310,8 @@ pub fn augment_public_key_256(mut cx: FunctionContext) -> JsResult<JsObject> {
         .augment(&util::js_object_to_public_key(
             &mut cx,
             other_public_key_obj,
-        )).unwrap();
+        ))
+        .unwrap();
 
     Ok(util::public_key_to_js_object(&mut cx, &augmented_public_key)?.upcast())
 }

native/src/util.rs

@@ -28,7 +28,7 @@ macro_rules! buffer_to_fixed_bytes { ($($fn_name: ident, $n: expr); *) => {
 ///
 /// Create the various methods we need to convert buffers into fixed length bytes
 ///
-buffer_to_fixed_bytes!{buffer_to_fixed_32_bytes, 32; buffer_to_fixed_64_bytes, 64; buffer_to_fixed_128_bytes, 128; buffer_to_fixed_384_bytes, 384}
+buffer_to_fixed_bytes! {buffer_to_fixed_32_bytes, 32; buffer_to_fixed_64_bytes, 64; buffer_to_fixed_128_bytes, 128; buffer_to_fixed_384_bytes, 384}
 
 ///
 /// Create a macro for converting JsBuffers to different types of signature objects which all have the same size
@@ -42,7 +42,7 @@ macro_rules! buffer_to_signature { ($($fn_name: ident, $sig_type: expr, $ret_typ
 ///
 /// Create two methods from the macro for Schnorr and ED25519 signatures
 ///
-buffer_to_signature!{buffer_to_schnorr_signature, SchnorrSignature::new, SchnorrSignature; buffer_to_ed25519_signature, Ed25519Signature::new, Ed25519Signature}
+buffer_to_signature! {buffer_to_schnorr_signature, SchnorrSignature::new, SchnorrSignature; buffer_to_ed25519_signature, Ed25519Signature::new, Ed25519Signature}
 
 ///
 /// Convert a JsBuffer handle of variable size into a vector
@@ -97,7 +97,8 @@ pub fn js_object_to_public_key<'a, T: Context<'a>>(
     PublicKey::new((
         buffer_to_fixed_32_bytes(cx, x, "publicKey.x"),
         buffer_to_fixed_32_bytes(cx, y, "publicKey.y"),
-    )).unwrap()
+    ))
+    .unwrap()
 }
 
 ///
@@ -167,7 +168,8 @@ pub fn js_object_to_transform_key<'a, T: Context<'a>>(
             cx,
             hashed_temp_key_buffer,
             "hashedTempKey",
-        )).unwrap(),
+        ))
+        .unwrap(),
         PublicSigningKey::new(buffer_to_fixed_32_bytes(
             cx,
             public_signing_key_buffer,
@@ -251,8 +253,10 @@ pub fn js_object_to_transform_blocks<'a, T: Context<'a>>(
                     random_transform_encrypted_temp_key,
                     "transformBlock.randomTransformEncryptedTempKey",
                 )),
-            ).unwrap()
-        }).collect();
+            )
+            .unwrap()
+        })
+        .collect();
 
     NonEmptyVec::try_from(&blocks).unwrap()
 }