Merge pull request #117 from cosmos/fabo/108-fix-gaia-api

changed gaia commands to new api
luniehq · Nov 28, 2017 · 07df35a · 07df35a
2 parents 8c46976 + 43959e2
commit 07df35a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/app/src/main/index.js b/app/src/main/index.js
@@ -195,8 +195,7 @@ app.on('ready', () => createWindow())
 async function startBaseserver (home) {
   log('startBaseserver', home)
   let child = startProcess(SERVER_BINARY, [
-    'server',
-    'serve',
+    'rest-server',
     '--home', home // ,
     // '--trust-node'
   ])
@@ -234,7 +233,7 @@ async function initBaseserver (chainId, home, node) {
   // fs.ensureDirSync(home)
   // `baseserver init` to generate config, trust seed
   let child = startProcess(SERVER_BINARY, [
-    'server',
+    'client',
     'init',
     '--home', home,
     '--chain-id', chainId,

diff --git a/test/unit/specs/main.spec.js b/test/unit/specs/main.spec.js
@@ -67,9 +67,9 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
           path.includes('gaia') &&
-          args.includes('server') &&
+          args.includes('client') &&
           args.includes('init') &&
-          args.splice(1).join('=').includes('--chain-id=gaia-1')
+          args.join('=').includes('--chain-id=gaia-1')
         )
       ).toBeDefined()
     })
@@ -78,8 +78,7 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
           path.includes('gaia') &&
-          args.includes('server') &&
-          args.includes('serve')
+          args.includes('rest-server')
         )
       ).toBeDefined()
       expect(main.processes.baseserverProcess).toBeDefined()
@@ -181,9 +180,9 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
           path.includes('gaia') &&
-          args.includes('server') &&
+          args.includes('client') &&
           args.includes('init') &&
-          args.splice(1).join('=').includes('--chain-id=gaia-1')
+          args.join('=').includes('--chain-id=gaia-1')
         )
       ).toBeDefined()
     })
@@ -192,8 +191,7 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
           path.includes('gaia') &&
-          args.includes('server') &&
-          args.includes('serve')
+          args.includes('rest-server')
         )
       ).toBeDefined()
       expect(main.processes.baseserverProcess).toBeDefined()
@@ -239,8 +237,7 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
           path.includes('gaia') &&
-          args.includes('server') &&
-          args.includes('serve')
+          args.includes('rest-server')
         )
       ).toBeDefined()
       expect(main.processes.baseserverProcess).toBeDefined()
@@ -286,8 +283,7 @@ describe('Startup Process', () => {
       expect(childProcess.spawn.mock.calls
         .find(([path, args]) =>
         path.includes('gaia') &&
-        args.includes('server') &&
-        args.includes('serve')
+        args.includes('rest-server')
       ).length
       ).toBeGreaterThan(1)
     })