some fixes

This commit is contained in:
poma 2019-10-04 19:17:28 +03:00
parent 55b3644fd7
commit 7a184d67d2
4 changed files with 6 additions and 7 deletions

View File

@ -5,8 +5,7 @@ node_js:
install: install:
- npm ci - npm ci
- cp .env.example .env - cp .env.example .env
- travis_wait 30 npm run build:circuit - travis_wait 30 npm run build
- npm run build:contract
- npx ganache-cli > /dev/null & - npx ganache-cli > /dev/null &
- npm run migrate:dev - npm run migrate:dev
script: script:

View File

@ -2,7 +2,7 @@
require('dotenv').config({ path: '../.env' }) require('dotenv').config({ path: '../.env' })
const ETHMixer = artifacts.require('ETHMixer') const ETHMixer = artifacts.require('ETHMixer')
const Verifier = artifacts.require('Verifier') const Verifier = artifacts.require('Verifier')
const hasherContract = artifacts.require('hasher') const hasherContract = artifacts.require('Hasher')
module.exports = function(deployer, network, accounts) { module.exports = function(deployer, network, accounts) {

View File

@ -2,7 +2,7 @@
require('dotenv').config({ path: '../.env' }) require('dotenv').config({ path: '../.env' })
const ERC20Mixer = artifacts.require('ERC20Mixer') const ERC20Mixer = artifacts.require('ERC20Mixer')
const Verifier = artifacts.require('Verifier') const Verifier = artifacts.require('Verifier')
const hasherContract = artifacts.require('hasher') const hasherContract = artifacts.require('Hasher')
const ERC20Mock = artifacts.require('ERC20Mock') const ERC20Mock = artifacts.require('ERC20Mock')

View File

@ -429,7 +429,7 @@ contract('ETHMixer', accounts => {
const newVerifier = accounts[7] const newVerifier = accounts[7]
await mixer.updateVerifier(newVerifier).should.be.fulfilled await mixer.updateVerifier(newVerifier).should.be.fulfilled
verifier = await mixer.verifier() const verifier = await mixer.verifier()
verifier.should.be.equal(newVerifier) verifier.should.be.equal(newVerifier)
}) })
@ -454,7 +454,7 @@ contract('ETHMixer', accounts => {
await mixer.disableVerifierUpdate().should.be.fulfilled await mixer.disableVerifierUpdate().should.be.fulfilled
newValue = await mixer.isVerifierUpdateAllowed() const newValue = await mixer.isVerifierUpdateAllowed()
newValue.should.be.equal(false) newValue.should.be.equal(false)
}) })
@ -467,7 +467,7 @@ contract('ETHMixer', accounts => {
await mixer.disableVerifierUpdate().should.be.fulfilled await mixer.disableVerifierUpdate().should.be.fulfilled
newValue = await mixer.isVerifierUpdateAllowed() const newValue = await mixer.isVerifierUpdateAllowed()
newValue.should.be.equal(false) newValue.should.be.equal(false)
const newVerifier = accounts[7] const newVerifier = accounts[7]