Skip to content

Instantly share code, notes, and snippets.

@feuGeneA
Created June 12, 2020 22:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save feuGeneA/82731e9b73358baf298c9977d5617465 to your computer and use it in GitHub Desktop.
Save feuGeneA/82731e9b73358baf298c9977d5617465 to your computer and use it in GitHub Desktop.
12Jun18:53:24 [2 jobs] ~/dev/0x-api[master *$%=]$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: package.json
modified: test/meta_transaction_test.ts
modified: test/utils/deployment.ts
modified: yarn.lock
Untracked files:
(use "git add <file>..." to include in what will be committed)
<CursorHold>
package.json.orig
test/utils/deployment.ts.orig
yarn.lock.before
yarn.lock.latest
yarn.lock.orig
no changes added to commit (use "git add" and/or "git commit -a")
12Jun18:53:55 [2 jobs] ~/dev/0x-api[master *$%=]$ git diff package.json
diff --git a/package.json b/package.json
index 8e191e3..1ac1d7a 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
},
"resolutions": {
"@0x/contract-addresses": "0xProject/gitpkg-registry#0x-contract-addresses-v4.9.0-e936c7c50",
- "@0x/contract-wrappers": "0xProject/gitpkg-registry#0x-contract-wrappers-v13.6.3-e936c7c50"
+ "@0x/contract-wrappers": "0xProject/gitpkg-registry#0x-contract-wrappers-v13.6.3-e936c7c50",
+ "@0x/contracts-zero-ex": "0xProject/gitpkg-registry#0x-contracts-zero-ex-v0.1.0-4fced276c"
},
"release": {
"plugins": [
@@ -124,7 +125,7 @@
},
"dependencies": {
"@0x/assert": "^3.0.4",
- "@0x/asset-swapper": "0xProject/gitpkg-registry#0x-asset-swapper-v4.4.0-b6fe17711",
+ "@0x/asset-swapper": "0xProject/gitpkg-registry#0x-asset-swapper-v4.4.0-effbc2398",
"@0x/connect": "^6.0.4",
"@0x/contract-addresses": "0xProject/gitpkg-registry#0x-contract-addresses-v4.9.0-e936c7c50",
"@0x/contract-wrappers": "0xProject/gitpkg-registry#0x-contract-wrappers-v13.6.3-e936c7c50",
12Jun18:54:02 [2 jobs] ~/dev/0x-api[master *$%=]$ git diff test/meta_transaction_test.ts
diff --git a/test/meta_transaction_test.ts b/test/meta_transaction_test.ts
index 4043915..b338aa1 100644
--- a/test/meta_transaction_test.ts
+++ b/test/meta_transaction_test.ts
@@ -15,7 +15,7 @@ import { META_TRANSACTION_PATH, ONE_SECOND_MS, TEN_MINUTES_MS } from '../src/con
import { GeneralErrorCodes, generalErrorCodeToReason, ValidationErrorCodes } from '../src/errors';
import { GetMetaTransactionQuoteResponse } from '../src/types';
-import { setupApiAsync, setupMeshAsync, teardownApiAsync, teardownMeshAsync } from './utils/deployment';
+import { LogType, setupApiAsync, setupMeshAsync, teardownApiAsync, teardownMeshAsync } from './utils/deployment';
import { constructRoute, httpGetAsync, httpPostAsync } from './utils/http_utils';
import { DEFAULT_MAKER_ASSET_AMOUNT, MeshTestUtils } from './utils/mesh_test_utils';
import { liquiditySources0xOnly } from './utils/mocks';
@@ -38,7 +38,7 @@ describe(SUITE_NAME, () => {
let zrx: DummyERC20TokenContract;
before(async () => {
- await setupApiAsync(SUITE_NAME);
+ await setupApiAsync(SUITE_NAME, { apiLogType: LogType.Console });
// connect to ganache and run contract migrations
const ganacheConfigs = {
12Jun18:54:06 [2 jobs] ~/dev/0x-api[master *$%=]$ git diff test/utils/deployment.ts
diff --git a/test/utils/deployment.ts b/test/utils/deployment.ts
index 7ca40b9..2723ed5 100644
--- a/test/utils/deployment.ts
+++ b/test/utils/deployment.ts
@@ -236,7 +236,7 @@ async function waitForApiStartupAsync(logStream: ChildProcessWithoutNullStreams)
});
setTimeout(() => {
reject(new Error('Timed out waiting for 0x-api logs'));
- }, 30000); // tslint:disable-line:custom-no-magic-numbers
+ }, 60000); // tslint:disable-line:custom-no-magic-numbers
});
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment