[SER-25_compatibilityWithRest] exported default and minor fixes

lib/auth/permission/permissionManager.js

@@ -184,7 +184,7 @@ async function listEvents(admin, contract, args) {
   return eventsJson
 }
 
-export {
+export default {
   bind,
   bindAddress,
   uploadContract,

lib/auth/permission/permissionedHashmap.js

@@ -110,7 +110,7 @@ async function remove(admin, contract, args) {
   await call(admin, callArgs, options)
 }
 
-export {
+export default {
   bind,
   bindAddress,
   uploadContract,

lib/auth/user/user.js

@@ -90,7 +90,7 @@ async function authenticate(admin, contract, pwHash) {
 }
 
 
-export {
+export default {
   uploadContract,
   bind,
   // constants

lib/auth/user/userManager.js

@@ -10,7 +10,7 @@ const contractFilename = `${util.cwd}/${config.libPath}/auth/user/contracts/User
 const options = { config };
 
 // TODO: (remove if not in use) const RestStatus = rest.getFields(`${config.libPath}/rest/contracts/RestStatus.sol`);
-import * as userJs from './user';
+import userJs from './user';
 
 async function uploadContract(admin) {
   // NOTE: in production, the contract is created and owned by the AdminInterface
@@ -126,7 +126,7 @@ async function authenticate(admin, contract, args) {
   return isOK;
 }
 
-export {
+export default {
   uploadContract,
   contractName,
   bind

lib/collections/hashmap/hashmap.js

@@ -119,7 +119,7 @@ async function getOwner(admin, contract, args) {
   return result[0];
 }
 
-export {
+export default {
   bind,
   uploadContract,
   put,

lib/collections/hashmap/unsafeHashmap.js

@@ -104,7 +104,7 @@ async function remove(admin, contract, args) {
   await call(admin, callArgs, options)
 }
 
-export {
+export default {
   bind,
   uploadContract,
 }

lib/index.js

@@ -0,0 +1,15 @@
+import permissionManager from './auth/permission/permissionManager';
+import permissionedHashmap from './auth/permission/permissionedHashmap';
+import user from './auth/user/user';
+import userManager from './auth/user/userManager';
+import hashmap from './collections/hashmap/hashmap';
+import unsafeHashmap from './collections/hashmap/unsafeHashmap';
+
+export {
+  permissionManager,
+  permissionedHashmap,
+  user,
+  userManager,
+  hashmap,
+  unsafeHashmap
+}

test/hashmap/hashmap.test.js

@@ -1,7 +1,7 @@
 import { assert } from 'chai';
 import { rest, util } from 'blockapps-rest';
 import { getYamlFile } from '../../lib/util/config';
-import * as hashmapJs from '../../lib/collections/hashmap/hashmap';
+import hashmapJs from '../../lib/collections/hashmap/hashmap';
 import { getCredentialArgs } from '../../lib/util/util';
 
 const { createUser } = rest;

test/hashmap/unsafeHashmap.test.js

@@ -2,7 +2,7 @@ import { assert } from 'chai';
 import { rest, util } from 'blockapps-rest';
 import { getYamlFile } from '../../lib/util/config';
 import { getCredentialArgs } from '../../lib/util/util';
-import * as unsafeHashmapJs from '../../lib/collections/hashmap/unsafeHashmap';
+import unsafeHashmapJs from '../../lib/collections/hashmap/unsafeHashmap';
 
 const { createUser } = rest;
 const config = getYamlFile('config.yaml');

test/permission/permissionManager.test.js

@@ -4,7 +4,7 @@ const { createUser, call } = rest;
 
 import { getYamlFile } from '../../lib/util/config';
 import { getCredentialArgs } from '../../lib/util/util';
-import * as permissionManagerJs from '../../lib/auth/permission/permissionManager';
+import permissionManagerJs from '../../lib/auth/permission/permissionManager';
 
 const config = getYamlFile('config.yaml');
 

test/permission/permissionedHashmap.test.js

@@ -4,7 +4,7 @@ const { createUser, call, createContract } = rest;
 
 import { getYamlFile } from '../../lib/util/config';
 import { getCredentialArgs } from '../../lib/util/util';
-import * as permissionedHashmapJs from '../../lib/auth/permission/permissionedHashmap';
+import permissionedHashmapJs from '../../lib/auth/permission/permissionedHashmap';
 
 const config = getYamlFile('config.yaml');
 

test/user/user.test.js

@@ -5,7 +5,7 @@ const { createUser } = rest;
 import { getYamlFile } from '../../lib/util/config';
 const config = getYamlFile('config.yaml');
 
-import { uploadContract, getUser } from '../../lib/auth/user/user';
+import userJs from '../../lib/auth/user/user';
 import { createUserArgs } from './user.factory';
 import { getCredentialArgs } from '../../lib/util/util';
 
@@ -25,7 +25,7 @@ describe('User tests', function () {
     const uid = util.uid();
     // create the user with constructor args
     const args = createUserArgs(admin.address, uid);
-    const contract = await uploadContract(admin, args);
+    const contract = await userJs.uploadContract(admin, args);
     const user = await contract.getState();
     assert.equal(user.account, args.account, 'account');
     assert.equal(user.username, args.username, 'username');
@@ -36,9 +36,9 @@ describe('User tests', function () {
     const uid = util.uid();
     // create the user with constructor args
     const args = createUserArgs(admin.address, uid);
-    const contract = await uploadContract(admin, args);
+    const contract = await userJs.uploadContract(admin, args);
     // search
-    const user = await getUser(args.username);
+    const user = await userJs.getUser(args.username);
     assert.equal(user.account, args.account, 'account');
     assert.equal(user.username, args.username, 'username');
     assert.equal(user.role, args.role, 'role');

test/user/userManager-load.test.js

@@ -4,7 +4,7 @@ const { createUser } = rest;
 
 import { getYamlFile } from '../../lib/util/config';
 const config = getYamlFile('config.yaml');
-import { uploadContract } from '../../lib/auth/user/userManager';
+import userManagerJs from '../../lib/auth/user/userManager';
 import { createUserArgs } from './user.factory';
 import { getCredentialArgs } from '../../lib/util/util';
 
@@ -22,7 +22,7 @@ describe('UserManager LOAD tests', function () {
   // get ready:  admin-user and manager-contract
   before(async function () {
     admin = await createUser(adminArgs, options);
-    contract = await uploadContract(admin);
+    contract = await userManagerJs.uploadContract(admin);
   });
 
   it('User address leading zeros - load test - count:' + count, async function () {

test/user/userManager.test.js

@@ -5,7 +5,7 @@ const { createUser, call } = rest;
 import { getYamlFile } from '../../lib/util/config';
 const config = getYamlFile('config.yaml');
 
-import { uploadContract } from '../../lib/auth/user/userManager';
+import userManagerJs from '../../lib/auth/user/userManager';
 import { createUserArgs } from './user.factory';
 import { getCredentialArgs } from '../../lib/util/util';
 
@@ -29,7 +29,7 @@ describe('UserManager tests', function () {
     RestStatus = await parser.parseFields(restStatusSource);
 
     admin = await createUser(adminArgs, options);
-    contract = await uploadContract(admin);
+    contract = await userManagerJs.uploadContract(admin);
     // bloc account must be created separately
     account = await createUser(blocArgs, options);
   });