From 759d7b9cc2e3b5386e37cf2e4d67ac2ea99f3845 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 14 Mar 2019 15:26:49 -0700 Subject: [PATCH] fix: adjust DEFAULT_TICKS_PER_SLOT to match main repo --- web3.js/src/timing.js | 2 +- web3.js/test/bpf-loader.test.js | 2 +- web3.js/test/connection.test.js | 2 +- web3.js/test/token-program.test.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web3.js/src/timing.js b/web3.js/src/timing.js index 6c541d5d77..eba12de637 100644 --- a/web3.js/src/timing.js +++ b/web3.js/src/timing.js @@ -3,5 +3,5 @@ // These constants should match the values in // https://github.com/solana-labs/solana/blob/master/sdk/src/timing.rs export const NUM_TICKS_PER_SECOND = 10; -export const DEFAULT_TICKS_PER_SLOT = 80; +export const DEFAULT_TICKS_PER_SLOT = 160; export const DEFAULT_SLOTS_PER_EPOCH = 64; diff --git a/web3.js/test/bpf-loader.test.js b/web3.js/test/bpf-loader.test.js index 9e206667f1..ac7fea82de 100644 --- a/web3.js/test/bpf-loader.test.js +++ b/web3.js/test/bpf-loader.test.js @@ -14,7 +14,7 @@ import {newAccountWithLamports} from './new-account-with-lamports'; if (!mockRpcEnabled) { // The default of 5 seconds is too slow for live testing sometimes - jest.setTimeout(15000); + jest.setTimeout(30000); } test('load BPF program', async () => { diff --git a/web3.js/test/connection.test.js b/web3.js/test/connection.test.js index 0af5200a79..12f09746b7 100644 --- a/web3.js/test/connection.test.js +++ b/web3.js/test/connection.test.js @@ -15,7 +15,7 @@ import {sleep} from '../src/util/sleep'; if (!mockRpcEnabled) { // The default of 5 seconds is too slow for live testing sometimes - jest.setTimeout(15000); + jest.setTimeout(30000); } const errorMessage = 'Invalid request'; diff --git a/web3.js/test/token-program.test.js b/web3.js/test/token-program.test.js index 81a9d81f59..ccf7f8bcbc 100644 --- a/web3.js/test/token-program.test.js +++ b/web3.js/test/token-program.test.js @@ -10,7 +10,7 @@ import {sleep} from '../src/util/sleep'; if (!mockRpcEnabled) { // The default of 5 seconds is too slow for live testing sometimes - jest.setTimeout(30000); + jest.setTimeout(60000); } function mockGetSignatureStatus(result: string = 'Confirmed') {