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

Remove erroneous set provider code for Contract constructor #5669

Merged
merged 8 commits into from
Dec 6, 2022
Merged

Remove erroneous set provider code for Contract constructor #5669

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98bebea
Remove erroneous set provider code for Contract constructor. Add Cont…
spacesailor24 Nov 30, 2022
6420e6e
Update CHANGELOGs
spacesailor24 Nov 30, 2022
a47e494
Debugging failing integration tests
spacesailor24 Dec 1, 2022
d9341ea
Apply suggestions from code review
spacesailor24 Dec 1, 2022
16b6bee
Use getSystemTestProvider instead of hardcoded string
spacesailor24 Dec 2, 2022
81ec99b
Refactor ternaries in Contract constructor to if statements
spacesailor24 Dec 2, 2022
6b1023f
Correct CHANGELOG entries
spacesailor24 Dec 2, 2022
d1b0b83
Remove unneeded checks in if statements
spacesailor24 Dec 2, 2022
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
51 changes: 33 additions & 18 deletions packages/web3-eth-contract/src/contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,25 +347,40 @@ export class Contract<Abi extends ContractAbi>
contextOrReturnFormat?: Web3ContractContext | DataFormat,
returnFormat?: DataFormat,
) {
let contractContext;
if (isWeb3ContractContext(addressOrOptionsOrContext)) {
contractContext = addressOrOptionsOrContext;
} else if (isWeb3ContractContext(optionsOrContextOrReturnFormat)) {
contractContext = optionsOrContextOrReturnFormat;
} else {
contractContext = contextOrReturnFormat;
}

let provider;
if (
typeof addressOrOptionsOrContext === 'object' &&
'provider' in addressOrOptionsOrContext
) {
provider = addressOrOptionsOrContext.provider;
} else if (
provider === undefined &&
typeof optionsOrContextOrReturnFormat === 'object' &&
'provider' in optionsOrContextOrReturnFormat
) {
provider = optionsOrContextOrReturnFormat.provider;
} else if (
provider === undefined &&
typeof contextOrReturnFormat === 'object' &&
'provider' in contextOrReturnFormat
) {
provider = contextOrReturnFormat.provider;
} else if (provider === undefined && Contract.givenProvider !== undefined) {
provider = Contract.givenProvider;
}
Muhammad-Altabba marked this conversation as resolved.
Show resolved Hide resolved

super({
// Due to abide by the rule that super must be first call in constructor
// Have to do this complex ternary conditions
// eslint-disable-next-line no-nested-ternary
...(isWeb3ContractContext(addressOrOptionsOrContext)
? addressOrOptionsOrContext
: isWeb3ContractContext(optionsOrContextOrReturnFormat)
? optionsOrContextOrReturnFormat
: contextOrReturnFormat),
provider:
(addressOrOptionsOrContext as Web3ContractContext)?.provider ??
// eslint-disable-next-line no-nested-ternary
(typeof optionsOrContextOrReturnFormat === 'object' &&
'provider' in optionsOrContextOrReturnFormat
? optionsOrContextOrReturnFormat.provider
: typeof contextOrReturnFormat === 'object' &&
'provider' in contextOrReturnFormat
? contextOrReturnFormat?.provider
: Contract.givenProvider),
...contractContext,
provider,
registeredSubscriptions: contractSubscriptions,
});

Expand Down