Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

4x tests updates #7162

Merged
merged 21 commits into from
Aug 2, 2024
Merged

4x tests updates #7162

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fbde107
updated config and closeOpenConnection in eth
jdevcs Jul 18, 2024
08d1818
no default to http and close open con
jdevcs Jul 18, 2024
2f0f9bb
unit test using local provider instead of default in utils
jdevcs Jul 18, 2024
13a8126
lint fix
jdevcs Jul 18, 2024
c082a87
bug fix of maxListenersWarningThreshold
jdevcs Jul 22, 2024
b419b78
fixes in defaults and sys test utils
jdevcs Jul 23, 2024
9e6de4f
lint fix
jdevcs Jul 23, 2024
cba43ee
tests update
jdevcs Jul 23, 2024
d06aaf8
timeout chenged for contract tests
jdevcs Jul 23, 2024
358cc2c
DEFAULT_SYSTEM_PROVIDER revert
jdevcs Jul 24, 2024
0b3a8fb
cypress timout change
jdevcs Jul 24, 2024
8f41c29
reusing waitForCondition
jdevcs Jul 24, 2024
e804bed
revert tests fix
jdevcs Jul 24, 2024
69cbe97
watch subscription transaction fix
jdevcs Jul 24, 2024
ff179bd
waitForCondition
jdevcs Jul 24, 2024
b80fc94
TransactionBlockTimeoutError tests updates
jdevcs Jul 25, 2024
9cdd968
updates
jdevcs Jul 25, 2024
09c74e2
update
jdevcs Jul 25, 2024
52e6850
unit test fix
jdevcs Jul 25, 2024
32e0431
Merge branch '4.x' into junaid/4xtestsfix
jdevcs Aug 2, 2024
1edaf85
changelog update
jdevcs Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/web3-core/src/web3_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ export abstract class Web3Config
const keys = Object.keys(options) as (keyof Web3ConfigOptions)[];
for (const key of keys) {
this._triggerConfigChange(key, options[key]);

if(!isNullish(options[key]) &&
typeof options[key] === 'number' &&
key === 'maxListenersWarningThreshold' )
{
// additionally set in event emitter
this.setMaxListenerWarningThreshold(Number(options[key]));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bug fix: #5079 (comment)

}
}
Object.assign(this.config, options);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-eth-contract/test/integration/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ along with web3.js. If not, see <http://www.gnu.org/licenses/>.
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('../config/setup');

const jestTimeout = String(process.env.WEB3_SYSTEM_TEST_PROVIDER).includes('ipc') ? 35000 : 15000;
const jestTimeout = String(process.env.WEB3_SYSTEM_TEST_PROVIDER).includes('ipc') ? 35000 : 25000;

jest.setTimeout(jestTimeout);
12 changes: 6 additions & 6 deletions packages/web3-eth-contract/test/unit/contract.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import {
GreeterWithOverloadingBytecode,
} from '../shared_fixtures/build/GreeterWithOverloading';
import { AllGetPastEventsData, getLogsData, getPastEventsData } from '../fixtures/unitTestFixtures';
import { getSystemTestProvider } from '../fixtures/system_test_utils';
import { erc721Abi } from '../fixtures/erc721';
import { ERC20TokenAbi } from '../shared_fixtures/build/ERC20Token';
import { processAsync } from '../shared_fixtures/utils';
Expand Down Expand Up @@ -150,7 +149,7 @@ describe('Contract', () => {
});

it('should set the provider, from options, upon instantiation', () => {
const provider = getSystemTestProvider();
const provider = "http://127.0.0.1:4545";
const contract = new Contract([], '', {
provider,
});
Expand All @@ -162,7 +161,7 @@ describe('Contract', () => {
});

it('should set the provider, from context, upon instantiation', () => {
const provider = getSystemTestProvider();
const provider = "http://127.0.0.1:4545";
const contract = new Contract(
[],
'',
Expand Down Expand Up @@ -816,17 +815,18 @@ describe('Contract', () => {
'0x00000000219ab540356cBB839Cbe05303d7705Fa',
{ gas: '0x97254' },
);

contract.maxListenersWarningThreshold = 1000;

const clonnedContract = contract.clone();

expect(stringify(contract)).toStrictEqual(stringify(clonnedContract));

contract.options.jsonInterface = GreeterAbi;
});

it('should clone new contract', () => {
const contract = new Contract(sampleStorageContractABI);

contract.maxListenersWarningThreshold = 1000;

const clonnedContract = contract.clone();
expect(stringify(contract)).toStrictEqual(stringify(clonnedContract));
});
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-eth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"test:e2e:sepolia": "jest --config=./test/e2e/jest.config.js --forceExit",
"test:watch": "npm test -- --watch",
"test:unit": "jest --config=./test/unit/jest.config.js",
"test:integration": "jest --config=./test/integration/jest.config.js --runInBand --forceExit",
"test:integration": "jest --config=./test/integration/jest.config.js --runInBand",
"test:coverage:integration": "jest --config=./test/integration/jest.config.js --runInBand --forceExit --coverage=true --coverage-reporters=text",
"test:e2e:electron": "npx cypress run --headless --browser electron",
"test:e2e:chrome": "npx cypress run --headless --browser chrome",
Expand Down
Loading
Loading