Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
dd88eedb
Commit
dd88eedb
authored
Apr 16, 2018
by
Iuri Matias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup
parent
ba6bbd85
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
13 deletions
+8
-13
tests.sol
sol/tests.sol
+5
-8
deployer.js
src/deployer.js
+2
-2
provider.js
src/provider.js
+1
-1
testRunner.js
src/testRunner.js
+0
-2
No files found.
sol/tests.sol
View file @
dd88eedb
...
@@ -15,8 +15,6 @@ library Assert {
...
@@ -15,8 +15,6 @@ library Assert {
function equal(uint a, uint b, string message) public returns (bool result) {
function equal(uint a, uint b, string message) public returns (bool result) {
result = (a == b);
result = (a == b);
AssertionEvent(result, message);
AssertionEvent(result, message);
//result = true;
//return true;
}
}
function equal(int a, int b, string message) public returns (bool result) {
function equal(int a, int b, string message) public returns (bool result) {
...
@@ -94,12 +92,11 @@ library Assert {
...
@@ -94,12 +92,11 @@ library Assert {
AssertionEvent(result, message);
AssertionEvent(result, message);
}
}
// // TODO: needs to be convert to bytes first to be comparable
// TODO: needs to be convert to bytes first to be comparable
// //function notEqual(string a, string b, string message) public returns (bool result) {
//function notEqual(string a, string b, string message) public returns (bool result) {
// // result = (a != b);
// result = (a != b);
// // AssertionEvent(result, message);
// AssertionEvent(result, message);
// //}
//}
}
}
src/deployer.js
View file @
dd88eedb
...
@@ -82,7 +82,6 @@ function deployAll (compileResult, web3, callback) {
...
@@ -82,7 +82,6 @@ function deployAll (compileResult, web3, callback) {
deployObject
.
send
({
deployObject
.
send
({
from
:
accounts
[
0
],
from
:
accounts
[
0
],
gas
:
Math
.
ceil
(
gasValue
*
1.2
)
gas
:
Math
.
ceil
(
gasValue
*
1.2
)
//gas: 1200000
}).
on
(
'receipt'
,
function
(
receipt
)
{
}).
on
(
'receipt'
,
function
(
receipt
)
{
contractObject
.
options
.
address
=
receipt
.
contractAddress
contractObject
.
options
.
address
=
receipt
.
contractAddress
contractObject
.
options
.
from
=
accounts
[
0
]
contractObject
.
options
.
from
=
accounts
[
0
]
...
@@ -93,7 +92,8 @@ function deployAll (compileResult, web3, callback) {
...
@@ -93,7 +92,8 @@ function deployAll (compileResult, web3, callback) {
nextEach
()
nextEach
()
}).
on
(
'error'
,
function
(
err
)
{
}).
on
(
'error'
,
function
(
err
)
{
console
.
dir
(
err
);
console
.
dir
(
err
)
nextEach
(
err
)
})
})
})
})
},
function
()
{
},
function
()
{
...
...
src/provider.js
View file @
dd88eedb
...
@@ -40,7 +40,7 @@ Provider.prototype.sendAsync = function(payload, callback) {
...
@@ -40,7 +40,7 @@ Provider.prototype.sendAsync = function(payload, callback) {
executionContext
.
web3
().
eth
.
getTransactionReceipt
(
payload
.
params
[
0
],
(
error
,
receipt
)
=>
{
executionContext
.
web3
().
eth
.
getTransactionReceipt
(
payload
.
params
[
0
],
(
error
,
receipt
)
=>
{
self
.
deployedContracts
[
receipt
.
contractAddress
]
=
receipt
.
data
self
.
deployedContracts
[
receipt
.
contractAddress
]
=
receipt
.
data
var
r
=
{
var
r
=
{
"transactionHash"
:
receipt
.
hash
,
"transactionHash"
:
receipt
.
hash
,
"transactionIndex"
:
"0x00"
,
"transactionIndex"
:
"0x00"
,
"blockHash"
:
"0x766d18646a06cf74faeabf38597314f84a82c3851859d9da9d94fc8d037269e5"
,
"blockHash"
:
"0x766d18646a06cf74faeabf38597314f84a82c3851859d9da9d94fc8d037269e5"
,
...
...
src/testRunner.js
View file @
dd88eedb
...
@@ -84,8 +84,6 @@ function runTest (testName, testObject, testCallback, resultsCallback) {
...
@@ -84,8 +84,6 @@ function runTest (testName, testObject, testCallback, resultsCallback) {
}
}
next
()
next
()
}).
on
(
'error'
,
function
(
err
)
{
}).
on
(
'error'
,
function
(
err
)
{
console
.
dir
(
"======== error ========"
);
console
.
dir
(
err
);
next
(
err
);
next
(
err
);
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment