From 0f442561304f409f67ce8b38f23af4f1b33e0b19 Mon Sep 17 00:00:00 2001 From: Jack Peterson Date: Mon, 10 Aug 2015 23:32:07 -0700 Subject: [PATCH] No scrypt on travis-ci --- .travis.yml | 1 - README.md | 5 ++++ test/keys.js | 76 +++++++++++++++++++++++++++------------------------- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3884d19..9e5d7c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ node_js: - "0.11" - "0.10" before_script: - - sudo apt-get install scrypt - npm install - npm install jshint mocha script: diff --git a/README.md b/README.md index 4d6f958..a15729f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ ethereumjs-keys =============== +[![Build Status](https://travis-ci.org/AugurProject/ethereumjs-keys.svg?branch=master)](https://travis-ci.org/AugurProject/ethereumjs-keys) +[![Coverage Status](https://coveralls.io/repos/AugurProject/ethereumjs-keys/badge.svg?branch=master&service=github)](https://coveralls.io/github/AugurProject/ethereumjs-keys?branch=master) + +[![NPM](https://nodei.co/npm/ethereumjs-keys.png)](https://nodei.co/npm/ethereumjs-keys/) + Generate, import and export Ethereum private keys. Uses PBKDF2 or scrypt key derivation functions. Installation diff --git a/test/keys.js b/test/keys.js index f028dfb..bc4766a 100644 --- a/test/keys.js +++ b/test/keys.js @@ -102,14 +102,16 @@ describe("Key derivation", function () { expected: "f06d69cdc7da0faffb1008270bca38f5e31891a3a773950e6d0fea48a7188551" }); - test({ - input: { - password: "testpassword", - salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19", - kdf: "scrypt" - }, - expected: "fac192ceb5fd772906bea3e118a69e8bbb5cc24229e20d8766fd298291bba6bd" - }); + if (!process.env.CONTINUOUS_INTEGRATION) { + test({ + input: { + password: "testpassword", + salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19", + kdf: "scrypt" + }, + expected: "fac192ceb5fd772906bea3e118a69e8bbb5cc24229e20d8766fd298291bba6bd" + }); + } }); @@ -333,35 +335,37 @@ describe("Dump private key", function () { } }); - test({ - input: { - password: "testpassword", - privateKey: "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d", - salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19", - iv: "83dbcc02d8ccb40e466191a123791e0e", - kdf: "scrypt" - }, - expected: { - address: "008aeeda4d805471df9b2a5b0f38a0c3bcba786b", - Crypto: { - cipher: "aes-128-ctr", - cipherparams: { - iv: "83dbcc02d8ccb40e466191a123791e0e" - }, - ciphertext: "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c", - kdf: "scrypt", - kdfparams: { - dklen: 32, - n: 262144, - r: 1, - p: 8, - salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19" - }, - mac: "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097" + if (!process.env.CONTINUOUS_INTEGRATION) { + test({ + input: { + password: "testpassword", + privateKey: "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d", + salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19", + iv: "83dbcc02d8ccb40e466191a123791e0e", + kdf: "scrypt" }, - version: 3 - } - }); + expected: { + address: "008aeeda4d805471df9b2a5b0f38a0c3bcba786b", + Crypto: { + cipher: "aes-128-ctr", + cipherparams: { + iv: "83dbcc02d8ccb40e466191a123791e0e" + }, + ciphertext: "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c", + kdf: "scrypt", + kdfparams: { + dklen: 32, + n: 262144, + r: 1, + p: 8, + salt: "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19" + }, + mac: "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097" + }, + version: 3 + } + }); + } });