Skip to content

Commit 58ffad8

Browse files
committed
Unpin truffle, add Metacoin e2e
1 parent d05e5a2 commit 58ffad8

File tree

5 files changed

+75
-32
lines changed

5 files changed

+75
-32
lines changed

.circleci/config.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@ jobs:
3838
# command: |
3939
# ./scripts/run-colony.sh
4040

41-
# It would be nice if all this could be a shell script but Circle is
42-
# extremely annoying about
43-
# a) cacheing
44-
# b) sudo
45-
# c) scripts
46-
# d) being in a docker container.
41+
# It would be nice if all this could be a shell script... :/
4742
e2e-zeppelin:
4843
docker:
4944
- image: circleci/node:10.12-stretch
@@ -62,10 +57,28 @@ jobs:
6257
sudo yarn add "$PR_PATH" --dev &&
6358
sudo npm run coverage
6459
60+
# AND...this doesn't work either! Thanks to truffle "obtain" and circle permission denied.
61+
e2e-metacoin:
62+
docker:
63+
- image: circleci/node:10.12-stretch
64+
steps:
65+
- checkout
66+
- run: >
67+
sudo npm config set user 0 &&
68+
sudo npm config set unsafe-perm true &&
69+
sudo rm -rf node_modules &&
70+
PR_PATH=$(echo "$CIRCLE_REPOSITORY_URL#$CIRCLE_BRANCH" | sudo sed 's/git@github.com:/https:\/\/github.com\//') &&
71+
sudo mkdir metacoin &&
72+
cd metacoin &&
73+
sudo npx truffle unbox metacoin &&
74+
sudo rm test/TestMetacoin.sol &&
75+
sudo yarn add $PR_PATH --dev &&
76+
sudo npx solidity-coverage
6577
workflows:
6678
version: 2
6779
build:
6880
jobs:
6981
- unit-test
7082
- e2e-zeppelin
83+
- e2e-metacoin
7184
#- e2e-colony

lib/truffleConfig.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ module.exports = function truffleConfig(port, gasLimit, gasPrice) {
99
gas: ${gasLimit},
1010
gasPrice: ${gasPrice}
1111
}
12-
},
13-
compilers: {
14-
solc: {
15-
version: "0.5.8",
16-
}
1712
}
1813
};`;
1914
};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
"mocha": "^4.1.0",
4343
"request": "^2.88.0",
4444
"solc": "^0.5.3",
45-
"truffle": "5.0.12"
45+
"truffle": "^5.0.26"
4646
}
4747
}

test/sources/zeppelin

Lines changed: 0 additions & 1 deletion
This file was deleted.

yarn.lock

Lines changed: 55 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,11 @@ browser-stdout@1.3.0:
253253
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
254254
integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=
255255

256+
browser-stdout@1.3.1:
257+
version "1.3.1"
258+
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
259+
integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
260+
256261
browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6:
257262
version "1.2.0"
258263
resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -425,6 +430,11 @@ commander@2.11.0:
425430
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
426431
integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
427432

433+
commander@2.15.1:
434+
version "2.15.1"
435+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
436+
integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
437+
428438
commander@~2.20.0:
429439
version "2.20.0"
430440
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
@@ -687,6 +697,11 @@ diff@3.3.1:
687697
resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
688698
integrity sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==
689699

700+
diff@3.5.0:
701+
version "3.5.0"
702+
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
703+
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
704+
690705
diffie-hellman@^5.0.0:
691706
version "5.0.3"
692707
resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -1332,6 +1347,11 @@ growl@1.10.3:
13321347
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
13331348
integrity sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==
13341349

1350+
growl@1.10.5:
1351+
version "1.10.5"
1352+
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
1353+
integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
1354+
13351355
handlebars@^4.0.1:
13361356
version "4.1.2"
13371357
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
@@ -1366,6 +1386,11 @@ has-flag@^2.0.0:
13661386
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
13671387
integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
13681388

1389+
has-flag@^3.0.0:
1390+
version "3.0.0"
1391+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
1392+
integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
1393+
13691394
has-symbol-support-x@^1.4.1:
13701395
version "1.4.2"
13711396
resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
@@ -1958,7 +1983,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
19581983
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
19591984
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
19601985

1961-
"minimatch@2 || 3", minimatch@^3.0.4:
1986+
"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4:
19621987
version "3.0.4"
19631988
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
19641989
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -2004,6 +2029,23 @@ mkdirp@*, mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0:
20042029
dependencies:
20052030
minimist "0.0.8"
20062031

2032+
mocha@5.2.0:
2033+
version "5.2.0"
2034+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
2035+
integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
2036+
dependencies:
2037+
browser-stdout "1.3.1"
2038+
commander "2.15.1"
2039+
debug "3.1.0"
2040+
diff "3.5.0"
2041+
escape-string-regexp "1.0.5"
2042+
glob "7.1.2"
2043+
growl "1.10.5"
2044+
he "1.1.1"
2045+
minimatch "3.0.4"
2046+
mkdirp "0.5.1"
2047+
supports-color "5.4.0"
2048+
20072049
mocha@^4.1.0:
20082050
version "4.1.0"
20092051
resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
@@ -2772,18 +2814,6 @@ sol-explore@^1.6.2:
27722814
resolved "https://registry.yarnpkg.com/sol-explore/-/sol-explore-1.6.2.tgz#43ae8c419fd3ac056a05f8a9d1fb1022cd41ecc2"
27732815
integrity sha1-Q66MQZ/TrAVqBfip0fsQIs1B7MI=
27742816

2775-
solc@0.5.0:
2776-
version "0.5.0"
2777-
resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.0.tgz#2deb2ae992acac3afb909f85c38d00f01dcb335e"
2778-
integrity sha512-mdLHDl9WeYrN+FIKcMc9PlPfnA9DG9ur5QpCDKcv6VC4RINAsTF4EMuXMZMKoQTvZhtLyJIVH/BZ+KU830Z8Xg==
2779-
dependencies:
2780-
fs-extra "^0.30.0"
2781-
keccak "^1.0.2"
2782-
memorystream "^0.3.1"
2783-
require-from-string "^2.0.0"
2784-
semver "^5.5.0"
2785-
yargs "^11.0.0"
2786-
27872817
solc@^0.5.3:
27882818
version "0.5.10"
27892819
resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.10.tgz#e57d789b1028f3d35f7989e5134d6ddc0e3b32aa"
@@ -2931,6 +2961,13 @@ supports-color@4.4.0:
29312961
dependencies:
29322962
has-flag "^2.0.0"
29332963

2964+
supports-color@5.4.0:
2965+
version "5.4.0"
2966+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
2967+
integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
2968+
dependencies:
2969+
has-flag "^3.0.0"
2970+
29342971
supports-color@^3.1.0:
29352972
version "3.2.3"
29362973
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
@@ -3022,15 +3059,14 @@ tree-kill@^1.2.0:
30223059
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
30233060
integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
30243061

3025-
truffle@5.0.12:
3026-
version "5.0.12"
3027-
resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.0.12.tgz#05ab7d2561a3ee4fd5e026dcc4b91b8f3c6e3795"
3028-
integrity sha512-dqnDmtTGNcnL29PHQwPE/CVmFFeGLuTFeb4TS3VY/vbASefu118IKXcadOWzkCPPwktv/njwylHSPhwoS00F2A==
3062+
truffle@^5.0.26:
3063+
version "5.0.26"
3064+
resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.0.26.tgz#cb9a6dcd77501821ba6e8ba51b2d4eef58da7458"
3065+
integrity sha512-gf3Khot59ZM2Tegqb2md0lpr1SXGUHKJkSajCyXsiFCiiHUbX6NpXn/mgJgk1SXt7FAHpL0zYdLI1pYfqzvBFw==
30293066
dependencies:
30303067
app-module-path "^2.2.0"
3031-
mocha "^4.1.0"
3068+
mocha "5.2.0"
30323069
original-require "1.0.1"
3033-
solc "0.5.0"
30343070

30353071
tslib@^1.9.0:
30363072
version "1.10.0"

0 commit comments

Comments
 (0)