Skip to content

Commit

Permalink
[CircleCI] Build walletkit explicitly & fix test (ethereum#411)
Browse files Browse the repository at this point in the history
* [CircleCI]Build walletkit explicitly

Earlier, `yarn` would build walletkit in the post install step.
That has been removed in celo-monorepo, therefore, build walletkit
explicitly to avoid https://circleci.com/gh/celo-org/celo-blockchain/7304

* Fixes node URL tests

Broken due to error message formatting
  • Loading branch information
Joshua Gutow authored Aug 19, 2019
1 parent 6013c86 commit f960cf7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ jobs:
# rm -rf analytics blockchain-api cli docs faucet helm-charts mobile notification-service react-components transaction-metrics-exporter verification-pool-api verifier web
cd ${CELO_MONOREPO_DIR}/packages/celotool
yarn || yarn
yarn --cwd=${CELO_MONOREPO_DIR}/packages/utils build
yarn --cwd=${CELO_MONOREPO_DIR}/packages/walletkit build
yarn --cwd=${CELO_MONOREPO_DIR}/packages/celotool build
- persist_to_workspace:
root: .
paths: .
Expand Down
5 changes: 3 additions & 2 deletions p2p/discv5/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ var parseNodeTests = []struct {
wantError: `invalid IP address`,
},
{
rawurl: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo",
wantError: `invalid port`,
rawurl: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo",
// net/url.Parse(rawurl) returns an error with rawurl and why the parse failed.
wantError: `parse enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo: invalid port ":foo" after host`,
},
{
rawurl: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:3?discport=foo",
Expand Down
3 changes: 2 additions & 1 deletion p2p/enode/urlv4_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ var parseNodeTests = []struct {
wantError: `invalid IP address`,
},
{
// net/url.Parse(rawurl) returns an error with rawurl and why the parse failed.
rawurl: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo",
wantError: `invalid port`,
wantError: `parse enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:foo: invalid port ":foo" after host`,
},
{
rawurl: "enode://1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439@127.0.0.1:3?discport=foo",
Expand Down

0 comments on commit f960cf7

Please sign in to comment.