Merge pull request hyperledger-indy#830 from Artemkaaas/feature/nodejs-ci

Vyacheslav · web-flow · commit 6415ac8fe4a3 · 2018-06-04T18:13:39.000+03:00
Feature/nodejs ci
diff --git a/Jenkinsfile.ci b/Jenkinsfile.ci
@@ -234,6 +234,7 @@ def linuxTesting(file, env_name, network_name) {
 
         sh "cp libindy/target/debug/libindy.so wrappers/java/lib"
         sh "cp libindy/target/debug/libindy.so wrappers/python"
+        sh "cp libindy/target/debug/libindy.so wrappers/nodejs"
         sh "cp libindy/target/debug/libindy.so cli"
         sh "cp libindy/target/debug/libindy.so libnullpay"
 
@@ -250,6 +251,7 @@ def linuxTesting(file, env_name, network_name) {
 
         stash includes: 'wrappers/java/lib/libindy.so', name: "LibindyJavaSO${env_name}"
         stash includes: 'wrappers/python/libindy.so', name: "LibindyPythonSO${env_name}"
+        stash includes: 'wrappers/nodejs/libindy.so', name: "LibindyNodejsSO${env_name}"
         stash includes: 'cli/libindy.so', name: "LibindyCliSO${env_name}"
         stash includes: 'cli/libnullpay.so', name: "LibnullpayCliSO${env_name}"
 
@@ -282,6 +284,7 @@ def linuxTesting(file, env_name, network_name) {
                 },
                 "${env_name}-java-test"   : { linuxModuleTesting(file, env_name, network_name, this.&linuxJavaTesting) },
                 "${env_name}-python-test" : { linuxModuleTesting(file, env_name, network_name, this.&linuxPythonTesting) },
+                "${env_name}-nodejs-test" : { linuxModuleTesting(file, env_name, network_name, this.&linuxNodejsTesting) },
                 "${env_name}-cli-test"    : { linuxModuleTesting(file, env_name, network_name, this.&linuxCLITesting) }
         ])
     }
@@ -338,6 +341,20 @@ def linuxPythonTesting(env_name, network_name, testEnv) {
     }
 }
 
+def linuxNodejsTesting(env_name, network_name, testEnv) {
+    unstash name: "LibindyNodejsSO${env_name}"
+    testEnv.inside("--network=${network_name}") {
+        echo "${env_name} Libindy Test: Test nodejs wrapper"
+
+        sh '''
+                cd wrappers/nodejs
+                npm run prepare
+                npm install
+                LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=trace TEST_POOL_IP=10.0.0.2 npm test
+            '''
+    }
+}
+
 def linuxCLITesting(env_name, network_name, testEnv) {
     if (env_name == "RedHat"){ // TODO: Delete it IS-702
         return;
diff --git a/cli/src/commands/wallet.rs b/cli/src/commands/wallet.rs
@@ -161,7 +161,7 @@ pub mod list_command {
                 print_list_table(&wallets,
                                  &vec![("name", "Name"),
                                        ("pool_name", "Associated pool name"),
-                                       ("xtype", "Type")],
+                                       ("type", "Type")],
                                  "There are no wallets");
 
                 if let Some((_, cur_wallet)) = get_opened_wallet(ctx) {
@@ -424,7 +424,7 @@ pub mod tests {
             {
                 let cmd = list_command::new();
                 let params = CommandParams::new();
-                cmd.execute(&ctx, &params).unwrap_err();
+                cmd.execute(&ctx, &params).unwrap();
             }
             TestUtils::cleanup_storage();
         }
diff --git a/libindy/ci/amazon.dockerfile b/libindy/ci/amazon.dockerfile
@@ -17,6 +17,10 @@ RUN \
            libsodium-devel \
            spectool
 
+# install nodejs and npm
+RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
+RUN yum -y install nodejs
+
 RUN cd /tmp && \
    curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz | tar -xz && \
     cd /tmp/libsodium-1.0.14 && \
diff --git a/libindy/ci/ubuntu.dockerfile b/libindy/ci/ubuntu.dockerfile
@@ -23,6 +23,10 @@ RUN apt-get update && \
       libncursesw5-dev \
       libzmq3-dev
 
+# install nodejs and npm
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt-get install -y nodejs
+
 RUN pip3 install -U \
 	pip \
 	setuptools \
@@ -49,4 +53,4 @@ USER indy
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.26.0
 ENV PATH /home/indy/.cargo/bin:$PATH
 
-WORKDIR /home/indy
+WORKDIR /home/indy
diff --git a/libindy/src/services/wallet/mod.rs b/libindy/src/services/wallet/mod.rs
@@ -36,6 +36,7 @@ use utils::crypto::pwhash_argon2i13::PwhashArgon2i13;
 #[derive(Serialize, Deserialize, Debug)]
 pub struct WalletDescriptor {
     pool_name: String,
+    #[serde(rename = "type")]
     xtype: String,
     name: String
 }
@@ -326,14 +327,16 @@ impl WalletService {
         let mut descriptors = Vec::new();
         let wallet_home_path = EnvironmentUtils::wallet_home_path();
 
-        for entry in fs::read_dir(wallet_home_path)? {
-            let dir_entry = if let Ok(dir_entry) = entry { dir_entry } else { continue };
-            if let Some(wallet_name) = dir_entry.path().file_name().and_then(|os_str| os_str.to_str()) {
-                let mut descriptor_json = String::new();
-                File::open(_wallet_descriptor_path(wallet_name)).ok()
-                    .and_then(|mut f| f.read_to_string(&mut descriptor_json).ok())
-                    .and_then(|_| WalletDescriptor::from_json(descriptor_json.as_str()).ok())
-                    .map(|descriptor| descriptors.push(descriptor));
+        if let Ok(entries) = fs::read_dir(wallet_home_path) {
+            for entry in entries {
+                let dir_entry = if let Ok(dir_entry) = entry { dir_entry } else { continue };
+                if let Some(wallet_name) = dir_entry.path().file_name().and_then(|os_str| os_str.to_str()) {
+                    let mut descriptor_json = String::new();
+                    File::open(_wallet_descriptor_path(wallet_name)).ok()
+                        .and_then(|mut f| f.read_to_string(&mut descriptor_json).ok())
+                        .and_then(|_| WalletDescriptor::from_json(descriptor_json.as_str()).ok())
+                        .map(|descriptor| descriptors.push(descriptor));
+                }
             }
         }
 
diff --git a/wrappers/nodejs/README.md b/wrappers/nodejs/README.md
@@ -1582,8 +1582,12 @@ Creates a new secure wallet with the given unique name.
 Custom types can be registered with indy\_register\_wallet\_type call.
 * `config`: String? - Wallet configuration json. List of supported keys are defined by wallet type.
 if NULL, then default config will be used.
-* `credentials`: String? - Wallet credentials json. List of supported keys are defined by wallet type.
-if NULL, then default config will be used.
+* `credentials`: String? - Wallet credentials json. 
+```
+{
+    "key": "wallet pass phrase"
+}
+```
 * __->__ void
 
 Errors: `Common*`, `Wallet*`
@@ -1603,8 +1607,12 @@ It is impossible to open wallet with the same name more than once.
     ... List of additional supported keys are defined by wallet type.
 }
 ````
-* `credentials`: String? - Wallet credentials json. List of supported keys are defined by wallet type.
-if NULL, then default credentials will be used.
+* `credentials`: String? - Wallet credentials json. 
+```
+{
+    "key": "wallet pass phrase"
+}
+```
 * __->__ `handle`: Handle (Number) - Handle to opened wallet to use in methods that require wallet access.
 
 Errors: `Common*`, `Wallet*`
@@ -1630,8 +1638,12 @@ Errors: `Common*`, `Wallet*`
 Deletes created wallet.
 
 * `name`: String - Name of the wallet to delete.
-* `credentials`: String? - Wallet credentials json. List of supported keys are defined by wallet type.
-if NULL, then default credentials will be used.
+* `credentials`: String? - Wallet credentials json. 
+```
+{
+    "key": "wallet pass phrase"
+}
+```
 * __->__ void
 
 Errors: `Common*`, `Wallet*`
diff --git a/wrappers/nodejs/src/index.js b/wrappers/nodejs/src/index.js
@@ -519,13 +519,13 @@ indy.deletePoolLedgerConfig = function deletePoolLedgerConfig (configName, cb) {
 
 indy.createWallet = function createWallet (poolName, name, xtype, config, credentials, cb) {
   cb = wrapIndyCallback(cb)
-  capi.createWallet(poolName, name, xtype, config, credentials, cb)
+  capi.createWallet(poolName, name, xtype, config, toJson(credentials), cb)
   return cb.promise
 }
 
 indy.openWallet = function openWallet (name, runtimeConfig, credentials, cb) {
   cb = wrapIndyCallback(cb)
-  capi.openWallet(name, runtimeConfig, credentials, cb)
+  capi.openWallet(name, runtimeConfig, toJson(credentials), cb)
   return cb.promise
 }
 
@@ -543,7 +543,7 @@ indy.closeWallet = function closeWallet (handle, cb) {
 
 indy.deleteWallet = function deleteWallet (name, credentials, cb) {
   cb = wrapIndyCallback(cb)
-  capi.deleteWallet(name, credentials, cb)
+  capi.deleteWallet(name, toJson(credentials), cb)
   return cb.promise
 }
 
diff --git a/wrappers/nodejs/test/anoncreds.js b/wrappers/nodejs/test/anoncreds.js
@@ -8,8 +8,9 @@ var indyHomeDir = require('home-dir')('.indy_client')
 test('anoncreds', async function (t) {
   var pool = await initTestPool()
   var wName = 'wallet-' + cuid()
-  await indy.createWallet(pool.name, wName, 'default', null, null)
-  var wh = await indy.openWallet(wName, null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
+  var wh = await indy.openWallet(wName, null, walletCredentials)
   var issuerDid = 'NcYxiDXkpYi6ov5FcYDi1e'
   var proverDid = 'VsKV7grR1BUE29mG2Fm2kX'
 
@@ -139,6 +140,6 @@ test('anoncreds', async function (t) {
   t.truthy(/^true /.test(mergedDelta.value.accum))
 
   await indy.closeWallet(wh)
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
   pool.cleanup()
 })
diff --git a/wrappers/nodejs/test/crypto.js b/wrappers/nodejs/test/crypto.js
@@ -6,8 +6,9 @@ var initTestPool = require('./helpers/initTestPool')
 test('crypto', async function (t) {
   var pool = await initTestPool()
   var wName = 'wallet-' + cuid()
-  await indy.createWallet(pool.name, wName, 'default', null, null)
-  var wh = await indy.openWallet(wName, null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
+  var wh = await indy.openWallet(wName, null, walletCredentials)
 
   // Create Key
   var error = await t.throws(indy.createKey(-1, {}))
@@ -54,6 +55,6 @@ test('crypto', async function (t) {
   t.is(decrypted.toString('utf8'), message.toString('utf8'))
 
   await indy.closeWallet(wh)
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
   pool.cleanup()
 })
diff --git a/wrappers/nodejs/test/did.js b/wrappers/nodejs/test/did.js
@@ -6,8 +6,9 @@ var initTestPool = require('./helpers/initTestPool')
 test('did', async function (t) {
   var pool = await initTestPool()
   var wName = 'wallet-' + cuid()
-  await indy.createWallet(pool.name, wName, 'default', null, null)
-  var wh = await indy.openWallet(wName, null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
+  var wh = await indy.openWallet(wName, null, walletCredentials)
 
   // List, create, and get
   t.deepEqual(await indy.listMyDidsWithMeta(wh), [])
@@ -55,6 +56,6 @@ test('did', async function (t) {
   t.deepEqual(await indy.listMyDidsWithMeta(wh), [data])
 
   await indy.closeWallet(wh)
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
   pool.cleanup()
 })
diff --git a/wrappers/nodejs/test/ledger.js b/wrappers/nodejs/test/ledger.js
@@ -26,15 +26,16 @@ async function waitUntilApplied (ph, req, cond) {
 test('ledger', async function (t) {
   var pool = await initTestPool()
   var wName = 'wallet-' + cuid()
-  await indy.createWallet(pool.name, wName, 'default', null, null)
-  var wh = await indy.openWallet(wName, null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
+  var wh = await indy.openWallet(wName, null, walletCredentials)
   var [trusteeDid] = await indy.createAndStoreMyDid(wh, {seed: '000000000000000000000000Trustee1'})
   var [myDid, myVerkey] = await indy.createAndStoreMyDid(wh, {seed: '00000000000000000000000000000My1', cid: true})
   var schemaName = 'schema-' + cuid()
   var [schemaId, schema] = await indy.issuerCreateSchema(myDid, schemaName, '1.0', ['name', 'age'])
 
   // Nym
-  var req = await indy.buildNymRequest(trusteeDid, myDid, myVerkey, null, null)
+  var req = await indy.buildNymRequest(trusteeDid, myDid, myVerkey, null, 'TRUSTEE')
   var res = await indy.signAndSubmitRequest(pool.handle, wh, trusteeDid, req)
   t.is(res.result.verkey, myVerkey)
 
@@ -141,6 +142,6 @@ test('ledger', async function (t) {
   t.is(typeof res[2], 'number')
 
   await indy.closeWallet(wh)
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
   pool.cleanup()
 })
diff --git a/wrappers/nodejs/test/pairwise.js b/wrappers/nodejs/test/pairwise.js
@@ -6,8 +6,9 @@ var initTestPool = require('./helpers/initTestPool')
 test('pairwise', async function (t) {
   var pool = await initTestPool()
   var wName = 'wallet-' + cuid()
-  await indy.createWallet(pool.name, wName, 'default', null, null)
-  var wh = await indy.openWallet(wName, null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
+  var wh = await indy.openWallet(wName, null, walletCredentials)
 
   var [theirDid, theirVerkey] = await indy.createAndStoreMyDid(wh, {})
   var [myDid] = await indy.createAndStoreMyDid(wh, {})
@@ -38,6 +39,6 @@ test('pairwise', async function (t) {
   })
 
   await indy.closeWallet(wh)
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
   pool.cleanup()
 })
diff --git a/wrappers/nodejs/test/wallet.js b/wrappers/nodejs/test/wallet.js
@@ -9,25 +9,26 @@ test('wallet', async function (t) {
   var listWallets = async function () {
     var list = await indy.listWallets()
     return list
-      .filter(a => a.associated_pool_name === pool.name)
+      .filter(a => a.pool_name === pool.name)
       .map(a => ({name: a.name, type: a.type}))
   }
 
   t.deepEqual(await listWallets(), [])
 
   var wName = 'wallet-' + cuid()
 
-  await indy.createWallet(pool.name, wName, 'default', null, null)
+  var walletCredentials = {'key': 'key'}
+  await indy.createWallet(pool.name, wName, 'default', null, walletCredentials)
 
   t.deepEqual(await listWallets(), [{name: wName, type: 'default'}])
 
-  var err = await t.throws(indy.createWallet(pool.name, wName, 'default', null, null))
+  var err = await t.throws(indy.createWallet(pool.name, wName, 'default', null, walletCredentials))
   t.is(err.indyName, 'WalletAlreadyExistsError')
 
-  var handle = await indy.openWallet(wName, null, null)
+  var handle = await indy.openWallet(wName, null, walletCredentials)
   t.truthy(handle >= 0)
 
-  err = await t.throws(indy.openWallet(wName, null, null))
+  err = await t.throws(indy.openWallet(wName, null, walletCredentials))
   t.is(err.indyName, 'WalletAlreadyOpenedError')
 
   err = await t.throws(indy.closeWallet(-1))
@@ -37,7 +38,7 @@ test('wallet', async function (t) {
 
   t.deepEqual(await listWallets(), [{name: wName, type: 'default'}])
 
-  await indy.deleteWallet(wName, null)
+  await indy.deleteWallet(wName, walletCredentials)
 
   t.deepEqual(await listWallets(), [])
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ pub mod list_command {`
`161`	`161`	`print_list_table(&wallets,`
`162`	`162`	`&vec![("name", "Name"),`
`163`	`163`	`("pool_name", "Associated pool name"),`
`164`		`- ("xtype", "Type")],`
	`164`	`+ ("type", "Type")],`
`165`	`165`	`"There are no wallets");`
`166`	`166`
`167`	`167`	`if let Some((_, cur_wallet)) = get_opened_wallet(ctx) {`
`@@ -424,7 +424,7 @@ pub mod tests {`
`424`	`424`	`{`
`425`	`425`	`let cmd = list_command::new();`
`426`	`426`	`let params = CommandParams::new();`
`427`		`- cmd.execute(&ctx, &params).unwrap_err();`
	`427`	`+ cmd.execute(&ctx, &params).unwrap();`
`428`	`428`	`}`
`429`	`429`	`TestUtils::cleanup_storage();`
`430`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -519,13 +519,13 @@ indy.deletePoolLedgerConfig = function deletePoolLedgerConfig (configName, cb) {`
`519`	`519`
`520`	`520`	`indy.createWallet = function createWallet (poolName, name, xtype, config, credentials, cb) {`
`521`	`521`	`cb = wrapIndyCallback(cb)`
`522`		`- capi.createWallet(poolName, name, xtype, config, credentials, cb)`
	`522`	`+ capi.createWallet(poolName, name, xtype, config, toJson(credentials), cb)`
`523`	`523`	`return cb.promise`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`indy.openWallet = function openWallet (name, runtimeConfig, credentials, cb) {`
`527`	`527`	`cb = wrapIndyCallback(cb)`
`528`		`- capi.openWallet(name, runtimeConfig, credentials, cb)`
	`528`	`+ capi.openWallet(name, runtimeConfig, toJson(credentials), cb)`
`529`	`529`	`return cb.promise`
`530`	`530`	`}`
`531`	`531`
`@@ -543,7 +543,7 @@ indy.closeWallet = function closeWallet (handle, cb) {`
`543`	`543`
`544`	`544`	`indy.deleteWallet = function deleteWallet (name, credentials, cb) {`
`545`	`545`	`cb = wrapIndyCallback(cb)`
`546`		`- capi.deleteWallet(name, credentials, cb)`
	`546`	`+ capi.deleteWallet(name, toJson(credentials), cb)`
`547`	`547`	`return cb.promise`
`548`	`548`	`}`
`549`	`549`