status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update specs

This commit is contained in:
Iuri Matias 2016-02-08 21:12:09 -05:00
parent 0e2573c69b
commit 84191a241c
6 changed files with 89 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/deploy.js
View File

@ -36,8 +36,9 @@ Deploy.prototype.deploy_contract = function(contractObject, contractParams, cb)
cb(contract.address);
}
else {
console.log("error deploying");
exit();
//console.log(arguments);
//console.log("error deploying");
//exit();
}
};

2
test/blockchain.js
View File

@ -10,7 +10,7 @@ describe('embark.blockchain', function() {
var blockchain = new Blockchain(blockchainConfig);
it('should return correct cmd', function() {
assert.strictEqual(blockchain.generate_basic_command(), "geth --datadir=\"/tmp/embark\" --logfile=\"/tmp/embark.log\" --port 30303 --rpc --rpcport 8101 --rpcaddr localhost --networkid "+blockchainConfig.networkId+" --rpccorsdomain \"*\" --minerthreads \"1\" --genesis=\"config/genesis.json\" --rpcapi \"eth,web3\" --maxpeers 4 --password config/password ");
assert.strictEqual(blockchain.generate_basic_command(), "geth --datadir=\"/tmp/embark\" --logfile=\"/tmp/embark.log\" --port 30303 --rpc --rpcport 8101 --rpcaddr localhost --networkid "+blockchainConfig.networkId+" --rpccorsdomain \"*\" --minerthreads \"1\" --genesis=\"config/genesis.json\" --rpcapi \"eth,web3\" --maxpeers 4 --password config/password ");
});
});

9
test/chain_manager.js
View File

@ -5,7 +5,8 @@ var assert = require('assert');
var fs = require('fs');
// TODO: replace with ethersim
var web3 = require('web3');
var Web3 = require('web3');
var web3 = new Web3();
web3.setProvider(new web3.providers.HttpProvider("http://localhost:8101"));
describe('embark.chain_manager', function() {
@ -19,7 +20,7 @@ describe('embark.chain_manager', function() {
chainManager.init('development', blockchainConfig, web3);
it('should initialize chain', function() {
var chain = chainManager.chainManagerConfig['0xcd9c11da1e46f86ce40a38b6ef84cfdfa6ea92598a27538f0e87da6d7a5c73d5']
var chain = chainManager.chainManagerConfig['0xb6611efad4ee3eb16e1349241b7015a5ed447e51d251372ef2704f63b5ad5cfc']
assert.equal(chain != undefined, true);
});
});
@ -30,7 +31,7 @@ describe('embark.chain_manager', function() {
chainManager.addContract("Foo", "123456", [], "0x123");
console.log(chainManager.chainManagerConfig);
var chain = chainManager.chainManagerConfig['0xcd9c11da1e46f86ce40a38b6ef84cfdfa6ea92598a27538f0e87da6d7a5c73d5']
var chain = chainManager.chainManagerConfig['0xb6611efad4ee3eb16e1349241b7015a5ed447e51d251372ef2704f63b5ad5cfc']
var contract = chain.contracts["d5d91a8825c5c253dff531ddda2354c4014f5699b7bcbea70207cfdcb37b6c8b"]
assert.equal(contract.name, "Foo");
@ -57,7 +58,7 @@ describe('embark.chain_manager', function() {
var chainFile = './test/support/chain_manager.json';
var content = fs.readFileSync(chainFile).toString();
assert.equal(content, '{"0xcd9c11da1e46f86ce40a38b6ef84cfdfa6ea92598a27538f0e87da6d7a5c73d5":{"contracts":{"d5d91a8825c5c253dff531ddda2354c4014f5699b7bcbea70207cfdcb37b6c8b\":{"name":"Foo","address":"0x123"}}}}');
assert.equal(content, '{"0xb6611efad4ee3eb16e1349241b7015a5ed447e51d251372ef2704f63b5ad5cfc":{"contracts":{"d5d91a8825c5c253dff531ddda2354c4014f5699b7bcbea70207cfdcb37b6c8b\":{"name":"Foo","address":"0x123"}}}}');
});
});

104
test/deploy.js
View File

@ -6,7 +6,8 @@ var assert = require('assert');
var web3 = require('web3');
// TODO: replace with ethersim
var web3 = require('web3');
var Web3 = require('web3');
var web3 = new Web3();
web3.setProvider(new web3.providers.HttpProvider("http://localhost:8101"));
setDeployConfig = function(config) {
@ -18,7 +19,7 @@ setDeployConfig = function(config) {
contractsConfig.loadConfigFile(config.contracts);
contractsConfig.init(config.files, 'development');
compiler.init('development');
return new Deploy('development', config.files, blockchainConfig, contractsConfig, chainManager);
return new Deploy('development', config.files, blockchainConfig, contractsConfig, chainManager, true, false, web3);
}
describe('embark.deploy', function() {
@ -37,15 +38,20 @@ describe('embark.deploy', function() {
blockchain: 'test/support/blockchain.yml',
contracts: 'test/support/arguments.yml'
});
deploy.deploy_contracts("development");
it("should deploy contracts", function() {
var all_contracts = ['Wallet', 'SimpleStorage', 'AnotherStorage', 'Wallets'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
it("should deploy contracts", function(done) {
deploy.deploy_contracts("development", function() {
var all_contracts = ['Wallet', 'SimpleStorage', 'AnotherStorage', 'Wallets'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
done();
});
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
});
});
@ -66,7 +72,10 @@ describe('embark.deploy', function() {
}
it("should deploy contracts", function() {
var result = deploy.generate_abi_file();
var result = "";
result += deploy.generate_provider_file();
result += deploy.generate_abi_file();
assert.strictEqual(result, "web3.setProvider(new web3.providers.HttpProvider('http://localhost:8101'));web3.eth.defaultAccount = web3.eth.accounts[0];SimpleStorageAbi = 123;SimpleStorageContract = web3.eth.contract(SimpleStorageAbi);SimpleStorage = SimpleStorageContract.at('0x123');AnotherStorageAbi = 234;AnotherStorageContract = web3.eth.contract(AnotherStorageAbi);AnotherStorage = AnotherStorageContract.at('0x234');");
});
@ -85,15 +94,20 @@ describe('embark.deploy', function() {
blockchain: 'test/support/blockchain.yml',
contracts: 'test/support/arguments2.yml'
});
deploy.deploy_contracts("development");
it("should deploy contracts", function() {
var all_contracts = ['token', 'Crowdsale'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
it("should deploy contracts", function(done) {
deploy.deploy_contracts("development", function() {
var all_contracts = ['token', 'Crowdsale'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
done();
});
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
});
});
@ -111,16 +125,20 @@ describe('embark.deploy', function() {
blockchain: 'test/support/blockchain.yml',
contracts: 'test/support/instances.yml'
});
deploy.deploy_contracts("development");
it("should deploy contracts", function() {
var all_contracts = ['BarStorage', 'FooStorage'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
it("should deploy contracts", function(done) {
deploy.deploy_contracts("development", function() {
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
assert.notEqual(deploy.deployedContracts.hasOwnProperty('SimpleStorage'), true);
var all_contracts = ['BarStorage', 'FooStorage'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
assert.notEqual(deploy.deployedContracts.hasOwnProperty('SimpleStorage'), true);
done();
});
});
});
@ -139,15 +157,18 @@ describe('embark.deploy', function() {
blockchain: 'test/support/blockchain.yml',
contracts: 'test/support/arguments3.yml'
});
deploy.deploy_contracts("development");
it("should deploy contracts", function() {
var all_contracts = ['DataSource', 'MyDataSource', 'Manager'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
it("should deploy contracts", function(done) {
deploy.deploy_contracts("development", function() {
var all_contracts = ['DataSource', 'MyDataSource', 'Manager'];
for(var i=0; i < all_contracts.length; i++) {
var className = all_contracts[i];
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
done();
});
});
it("should execute deploy changes", function() {
@ -184,19 +205,20 @@ describe('embark.deploy', function() {
blockchain: 'test/support/blockchain.yml',
contracts: 'test/support/address.yml'
});
deploy.deploy_contracts("development");
it("should not deploy contracts with addresses defined", function() {
var expected_deploys = ['SimpleStorage', 'BarStorage', 'FooStorage'];
it("should not deploy contracts with addresses defined", function(done) {
deploy.deploy_contracts("development", function() {
var expected_deploys = ['SimpleStorage', 'BarStorage', 'FooStorage'];
for(var i=0; i < expected_deploys.length; i++) {
var className = expected_deploys[i];
for(var i=0; i < expected_deploys.length; i++) {
var className = expected_deploys[i];
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
assert.equal(deploy.deployedContracts.hasOwnProperty(className), true);
}
assert.equal(deploy.deployedContracts['SimpleStorage'], '0x123');
assert.equal(deploy.deployedContracts['BarStorage'], '0x234');
assert.equal(deploy.deployedContracts['SimpleStorage'], '0x123');
assert.equal(deploy.deployedContracts['BarStorage'], '0x234');
});
});
});

2
test/support/chain_manager.json
View File

@ -1 +1 @@
{}
{"0xb6611efad4ee3eb16e1349241b7015a5ed447e51d251372ef2704f63b5ad5cfc":{"contracts":{"d5d91a8825c5c253dff531ddda2354c4014f5699b7bcbea70207cfdcb37b6c8b":{"name":"Foo","address":"0x123"}}}}

32
test/test.js
View File

@ -6,24 +6,24 @@ var assert = require('assert');
//var contractFiles = grunt.file.expand("./app/contracts/**/*.sol")
describe('embark.test', function() {
var files = [
'test/support/contracts/simple_storage.sol'
]
var _blockchainConfig = (new Config.Blockchain()).loadConfigFile('test/support/blockchain.yml');
var blockchainConfig = _blockchainConfig.config("development");
var compiler = new Compiler(_blockchainConfig);
var contractsConfig = new Config.Contracts(blockchainConfig, compiler);
contractsConfig.loadConfigFile('test/support/contracts.yml');
contractsConfig.init(files, 'development');
//var files = [
// 'test/support/contracts/simple_storage.sol'
//]
//var _blockchainConfig = (new Config.Blockchain()).loadConfigFile('test/support/blockchain.yml');
//var blockchainConfig = _blockchainConfig.config("development");
//var compiler = new Compiler(_blockchainConfig);
//var contractsConfig = new Config.Contracts(blockchainConfig, compiler);
//contractsConfig.loadConfigFile('test/support/contracts.yml');
//contractsConfig.init(files, 'development');
describe('simple test', function() {
var embarkSpec = new Test(contractsConfig, files);
//describe('simple test', function() {
// var embarkSpec = new Test(contractsConfig, files);
it('execute simple test', function() {
var SimpleStorage = embarkSpec.request('SimpleStorage', [100])
// it('execute simple test', function() {
// var SimpleStorage = embarkSpec.request('SimpleStorage', [100])
assert.equal(SimpleStorage.storedData(), '100');
});
});
// assert.equal(SimpleStorage.storedData(), '100');
// });
//});
});