m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Make deployment states in test/e2e/beta/contract-test/contract.js more explicit

Browse Source
This commit is contained in:
Dan Miller 2018-08-14 12:34:39 -02:30
parent c00d0daeb5
commit 860bf42346
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/beta/contract-test/contract.js
View File

@ -38,18 +38,19 @@ const transferTokens = document.getElementById('transferTokens')
const approveTokens = document.getElementById('approveTokens') const approveTokens = document.getElementById('approveTokens')
deployButton.addEventListener('click', async function (event) { deployButton.addEventListener('click', async function (event) {
document.getElementById('contractStatus').innerHTML = 'Deploying'
var piggybank = await piggybankContract.new( var piggybank = await piggybankContract.new(
{ {
from: web3.eth.accounts[0], from: web3.eth.accounts[0],
data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029', data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
gas: '4700000', gas: '4700000',
}, function (e, contract) { }, function (e, contract) {
console.log(e, contract) if (e) {
if (typeof contract.address !== 'undefined') { throw e
} else if (typeof contract.address !== 'undefined') {
console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash) console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash)
console.log(`contract`, contract)
document.getElementById('contractStatus').innerHTML = 'Deployed' document.getElementById('contractStatus').innerHTML = 'Deployed'
depositButton.addEventListener('click', function (event) { depositButton.addEventListener('click', function (event) {

2
test/e2e/beta/contract-test/index.html
View File

@ -11,7 +11,7 @@
<button id="withdrawButton">Withdraw</button> <button id="withdrawButton">Withdraw</button>
</div> </div>
<div id="contractStatus" style="display: flex; font-size: 1rem;"> <div id="contractStatus" style="display: flex; font-size: 1rem;">
Not yet deployed Not clicked
</div> </div>
</div> </div>
<div style="display: flex; flex-flow: column;"> <div style="display: flex; flex-flow: column;">