mirror of https://github.com/embarklabs/embark.git
update test_app
This commit is contained in:
parent
c2c894cfb1
commit
e74b3a2693
|
@ -2,6 +2,14 @@ pragma solidity ^0.4.17;
|
||||||
|
|
||||||
import "ownable.sol";
|
import "ownable.sol";
|
||||||
|
|
||||||
|
library Assert {
|
||||||
|
event TestEvent(bool passed, string message);
|
||||||
|
|
||||||
|
function triggerEvent(bool passed, string message) internal {
|
||||||
|
TestEvent(passed, message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
contract SimpleStorage is Ownable {
|
contract SimpleStorage is Ownable {
|
||||||
uint public storedData;
|
uint public storedData;
|
||||||
|
|
||||||
|
@ -16,6 +24,7 @@ contract SimpleStorage is Ownable {
|
||||||
for(uint i = 0; i < 1000; i++) {
|
for(uint i = 0; i < 1000; i++) {
|
||||||
storedData += i;
|
storedData += i;
|
||||||
}
|
}
|
||||||
|
Assert.triggerEvent(true, "hi");
|
||||||
}
|
}
|
||||||
|
|
||||||
function set2(uint x, uint unusedGiveWarning) public onlyOwner {
|
function set2(uint x, uint unusedGiveWarning) public onlyOwner {
|
||||||
|
|
|
@ -4,6 +4,7 @@ import React, { Component } from 'react';
|
||||||
import EmbarkJS from 'Embark/EmbarkJS';
|
import EmbarkJS from 'Embark/EmbarkJS';
|
||||||
import SimpleStorage from 'Embark/contracts/SimpleStorage';
|
import SimpleStorage from 'Embark/contracts/SimpleStorage';
|
||||||
import Test from 'Embark/contracts/Test';
|
import Test from 'Embark/contracts/Test';
|
||||||
|
import Assert from 'Embark/contracts/Assert';
|
||||||
|
|
||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
|
|
||||||
|
@ -22,6 +23,7 @@ import { Navbar, Jumbotron, Button } from 'react-bootstrap';
|
||||||
window.EmbarkJS = EmbarkJS;
|
window.EmbarkJS = EmbarkJS;
|
||||||
window.SimpleStorage = SimpleStorage;
|
window.SimpleStorage = SimpleStorage;
|
||||||
window.Test = Test;
|
window.Test = Test;
|
||||||
|
window.Assert = Assert;
|
||||||
|
|
||||||
window.React = React;
|
window.React = React;
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
},
|
},
|
||||||
"dappConnection": [
|
"dappConnection": [
|
||||||
"$WEB3",
|
"$WEB3",
|
||||||
|
"ws://localhost:8546",
|
||||||
"http://localhost:8550",
|
"http://localhost:8550",
|
||||||
"http://localhost:8545",
|
"http://localhost:8545",
|
||||||
"http://localhost:8550"
|
"http://localhost:8550"
|
||||||
|
@ -21,7 +22,7 @@
|
||||||
"deploy": false
|
"deploy": false
|
||||||
},
|
},
|
||||||
"SimpleStorage": {
|
"SimpleStorage": {
|
||||||
"fromIndex": 1,
|
"fromIndex": 0,
|
||||||
"args": [
|
"args": [
|
||||||
100
|
100
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue