Updated to new solc version

This commit is contained in:
Jordi Baylina
2017-02-09 07:35:01 +01:00
parent 05cb0a5e10
commit 7cdae6b451
3 changed files with 11 additions and 9 deletions

View File

@@ -32,16 +32,16 @@ exports.deploy = function(opts, cb) {
});
},
function(cb) {
ethConnector.compile(src, function(err, result) {
ethConnector.solCompile(src, function(err, result) {
if (err) return cb(err);
compilationResult = result;
cb();
});
},
function(cb) {
miniMeTokenFactoryAbi = JSON.parse(compilationResult.MiniMeTokenFactory.interface);
ethConnector.deploy(compilationResult.MiniMeTokenFactory.interface,
compilationResult.MiniMeTokenFactory.bytecode,
miniMeTokenFactoryAbi = JSON.parse(compilationResult[":MiniMeTokenFactory"].interface);
ethConnector.deploy(compilationResult[":MiniMeTokenFactory"].interface,
compilationResult[":MiniMeTokenFactory"].bytecode,
0,
0,
function(err, _miniMeTokenFactory) {
@@ -51,10 +51,10 @@ exports.deploy = function(opts, cb) {
});
},
function(cb) {
miniMeTokenAbi = JSON.parse(compilationResult.MiniMeToken.interface);
miniMeTokenAbi = JSON.parse(compilationResult[":MiniMeToken"].interface);
exports.miniMeTokenAbi = miniMeTokenAbi;
ethConnector.deploy(compilationResult.MiniMeToken.interface,
compilationResult.MiniMeToken.bytecode,
ethConnector.deploy(compilationResult[":MiniMeToken"].interface,
compilationResult[":MiniMeToken"].bytecode,
0,
0,
miniMeTokenFactory.address,

View File

@@ -1,6 +1,6 @@
{
"name": "minime",
"version": "0.0.2",
"version": "0.0.3",
"description": "MiniMe contract",
"main": "index.js",
"directories": {
@@ -31,6 +31,6 @@
},
"homepage": "https://github.com/Giveth/minime",
"dependencies": {
"ethconnector": "0.0.21"
"ethconnector": "0.0.24"
}
}

View File

@@ -33,10 +33,12 @@ describe('MiniMeToken test', function(){
var b = [];
before(function(done) {
this.timeout(200000000);
ethConnector.init('testrpc' ,{gasLimit: 4000000}, done);
// ethConnector.init('rpc', done);
});
it('should deploy all the contracts ', function(done){
this.timeout(200000000);
var now = Math.floor(new Date().getTime() /1000);