Skip to content

Commit e639e6d

Browse files
mishfitvikmeup
authored andcommittedJun 28, 2018
upgrade provider-engine (#11)
* move src/JavaScript out of "JS" directory * add tests and coverage also, use web3 1.0 * make engine from scratch * add trust specific tests
1 parent 84946dc commit e639e6d

23 files changed

+49377
-44968
lines changed
 

‎JS/.babelrc ‎.babelrc

File renamed without changes.

‎.eslintrc.js

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"commonjs": true,
5+
"es6": true
6+
},
7+
"extends": "eslint:recommended",
8+
"parserOptions": {
9+
"sourceType": "module",
10+
"ecmaVersion": 2017
11+
},
12+
"rules": {
13+
"linebreak-style": [
14+
"error",
15+
"unix"
16+
],
17+
"quotes": [
18+
"error",
19+
"single"
20+
],
21+
"semi": [
22+
"error",
23+
"never"
24+
]
25+
}
26+
};

‎.gitignore

+11-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ Carthage/Build
3939

4040

4141
# JS
42-
JS/node_modules/
43-
JS/jspm_packages/
44-
JS/staging/
45-
*.swp
46-
*.swo
42+
node_modules/
43+
jspm_packages/
44+
staging/
4745

4846
# Android
4947
.idea
@@ -96,3 +94,11 @@ gen-external-apklibs
9694

9795

9896
tn/trustnative.aar
97+
98+
# Solidity Coverage fiels
99+
coverage/
100+
coverage.json
101+
102+
# Vim swap files
103+
*.swp
104+
*.swo

‎.solcover.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
skipFiles: [ 'Migrations.sol']
3+
};

‎.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: node_js
2+
node_js: node
3+
cache:
4+
directories:
5+
- 'node_modules'
6+
7+
script:
8+
- npm run cover
9+
after_script:
10+
- cat coverage/lcov.info | coveralls

‎Example/Pods/Local Podspecs/TrustWeb3Provider.podspec.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Pods.xcodeproj/project.pbxproj

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JS/.DS_Store

-6 KB
Binary file not shown.

‎JS/dist/trust-min.js

-1
This file was deleted.

‎JS/src/index.js

-112
This file was deleted.

‎TrustWeb3Provider.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ Pod::Spec.new do |s|
2525
s.ios.deployment_target = '8.0'
2626

2727
s.resource_bundles = {
28-
'TrustWeb3Provider' => ['JS/dist/trust-min.js']
28+
'TrustWeb3Provider' => ['dist/trust-min.js']
2929
}
3030
end

‎contracts/Ownable.sol

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
pragma solidity 0.4.23;
2+
3+
4+
contract Ownable {
5+
6+
address public owner;
7+
8+
event NewOwner(address indexed owner);
9+
10+
constructor () public {
11+
owner = msg.sender;
12+
}
13+
14+
modifier restricted () {
15+
if (owner != msg.sender) revert();
16+
_;
17+
}
18+
19+
function setOwner (address candidate) public restricted {
20+
if (candidate == address(0)) revert();
21+
owner = candidate;
22+
emit NewOwner(owner);
23+
}
24+
}

‎dist/trust-min.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.