updated tests

This commit is contained in:
viktor 2017-10-24 15:54:26 +03:00
parent 998e2dceb5
commit ddb29773d7
5 changed files with 115 additions and 84 deletions

4
jsTests/buy.js Normal file
View File

@ -0,0 +1,4 @@
let utils = require("./utils");
let investorAddr = "0xEaeBA7869E23A328a0A92620BbA1A7a6aaED26cB"
utils.buyFromWizard(investorAddr);

12
jsTests/findContracts.js Normal file
View File

@ -0,0 +1,12 @@
let utils = require("./utils");
for (let i = 1; i < 50; i++) {
utils.getBlockData("left", i, function(res) {
for (let j = 0; j < res.transactions.length; j++) {
let txHash = res.transactions[j]
utils.getTxReceipt("left", txHash, function(txRes) {
if (txRes.contractAddress) console.log("block number = ",i, "contract address = ",txRes.contractAddress);
});
}
})
}

View File

@ -3,82 +3,14 @@ let fs = require("fs")
let toml = require("toml")
let investorAddr = "0xEaeBA7869E23A328a0A92620BbA1A7a6aaED26cB"
let txHash = "0x325f14869a538f2dd70f8b0f77a3f965db10eeb65a44a27dcb83c16c06196316"
//check that contract is created correctly: should return values
//getAuthorities("left");
//getRequiredSignatures("left");
getAuthorities("right");
getRequiredSignatures("right");
utils.getAuthorities("right");
utils.getRequiredSignatures("right");
utils.getTxReceipt("left", txHash);
utils.getTxData("left", txHash);
getTokenBalanceOf(investorAddr);
//getTokenBalanceOf(investorAddr);
var dbtoml = fs.readFileSync('../examples/db.toml').toString('utf8');
var db = toml.parse(dbtoml);
utils.getBalance("left", db.home_contract_address);
//buyFromWizard(investorAddr);
function getAuthorities(side) {
utils.attachToContract(side, function(err, contract, web3) {
contract.methods.authorities(0).call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getAuthorities from " + side + ":");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getRequiredSignatures(side) {
utils.attachToContract(side, function(err, contract, web3) {
contract.methods.requiredSignatures().call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getRequiredSignatures from " + side + ":");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getTokenBalanceOf(addr) {
utils.attachToContract("right", function(err, contract, web3) {
contract.methods.balances(addr).call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getTokenBalanceOf from right:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function buyFromWizard(addr) {
utils.attachToContract("left", function(err, contract, web3) {
contract.methods.buy().send({from: web3.eth.defaultAccount, value: 1000000000000000, from: addr}).then(function(err, result) {
console.log("buy from left:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function buyFromBridge(addr) {
utils.attachToContract("left", function(err, contract, web3) {
web3.eth.sendTransaction({from: web3.eth.defaultAccount, value: 1000000000000000, from: addr, to: db.home_contract_address}).then(function(err, result) {
console.log("buy from left:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getDeposits(hash) {
utils.attachToContract("right", function(err, contract, config, web3) {
contract.methods.deposits(hash).call({from: web3.eth.defaultAccount}, function(result) {
console.log("getBalances from right:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
//utils.getBalance("left", db.home_contract_address);

6
jsTests/txData.js Normal file
View File

@ -0,0 +1,6 @@
let utils = require("./utils");
let txHash = "0x2a7d607300016547e4be03b06a4b354d0ff9209af51b0933a0bfa9a3fac61a1b"
utils.getTxReceipt("right", txHash);
utils.getTxData("left", txHash);

View File

@ -59,17 +59,16 @@ function configureWeb3(side, cb) {
cb(null, web3, config, defaultAccount);
}
function getTxReceipt(side, txhash) {
console.log("***getTxReceipt***");
function getTxReceipt(side, txhash, cb) {
configureWeb3(side, function(err, web3, config, defaultAccount) {
web3.eth.getTransactionReceipt(txhash, function(err, val) {
console.log(val);
if (!cb) console.log(val);
if (cb) cb(val);
});
});
}
function getTxData(side, txhash) {
console.log("***getTxData***");
configureWeb3(side, function(err, web3, config, defaultAccount) {
web3.eth.getTransaction(txhash, function(err, val) {
console.log(val);
@ -94,12 +93,90 @@ function checkTxMined(web3, txhash, cb) {
});
}
module.exports = {
attachToContract: attachToContract,
getConfig: getConfig,
configureWeb3: configureWeb3,
getTxReceipt: getTxReceipt,
getTxData: getTxData,
getBalance: getBalance,
checkTxMined: checkTxMined
function getAuthorities(side) {
attachToContract(side, function(err, contract, web3) {
contract.methods.authorities(0).call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getAuthorities from " + side + ":");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getBlockData(side, blokNumber, cb) {
configureWeb3(side, function(err, web3, config, defaultAccount) {
web3.eth.getBlock(blokNumber).then(
function(res) {
if (!cb) console.log(res)
if (cb) cb(res)
}
);
});
}
function getRequiredSignatures(side) {
attachToContract(side, function(err, contract, web3) {
contract.methods.requiredSignatures().call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getRequiredSignatures from " + side + ":");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getTokenBalanceOf(addr) {
attachToContract("right", function(err, contract, web3) {
contract.methods.balances(addr).call({from: web3.eth.defaultAccount}).then(function(result) {
console.log("getTokenBalanceOf from right:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function buyFromWizard(addr) {
attachToContract("left", function(err, contract, web3) {
contract.methods.buy().send({from: web3.eth.defaultAccount, value: 1000000000000000, from: addr}).then(function(err, result) {
console.log("buy from left:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function buyFromBridge(addr) {
attachToContract("left", function(err, contract, web3) {
web3.eth.sendTransaction({from: web3.eth.defaultAccount, value: 1000000000000000, from: addr, to: db.home_contract_address}).then(function(err, result) {
console.log("buy from left:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
function getDeposits(hash) {
attachToContract("right", function(err, contract, config, web3) {
contract.methods.deposits(hash).call({from: web3.eth.defaultAccount}, function(result) {
console.log("getBalances from right:");
if (err) console.log(err);
console.log("result: " + result);
});
});
}
module.exports = {
attachToContract,
getConfig,
configureWeb3,
getTxReceipt,
getTxData,
getBalance,
checkTxMined,
getAuthorities,
getBlockData,
getRequiredSignatures,
getTokenBalanceOf,
buyFromWizard,
buyFromBridge,
getDeposits
}