Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed gaia commands to new api #117

Merged
merged 3 commits into from
Nov 28, 2017
Merged

changed gaia commands to new api #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d06f8cf
changed gaia commands to new api
faboweb Nov 27, 2017
0d0fd7c
fixed tests
faboweb Nov 27, 2017
43959e2
Merge branch 'develop' into fabo/108-fix-gaia-api
nylira Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
])
Expand Down Expand Up @@ -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,
Expand Down
20 changes: 8 additions & 12 deletions test/unit/specs/main.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})
Expand All @@ -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()
Expand Down Expand Up @@ -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()
})
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
})
Expand Down