Skip to content

Commit 9c8482f

Browse files
committed
refactor!: Remove providerFromEngine
1 parent 58c9583 commit 9c8482f

File tree

7 files changed

+13
-78
lines changed

7 files changed

+13
-78
lines changed

packages/eth-block-tracker/tests/withBlockTracker.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import { providerFromEngine } from '@metamask/eth-json-rpc-provider';
2-
import type {
3-
// Eip1193Request,
4-
InternalProvider,
5-
} from '@metamask/eth-json-rpc-provider';
1+
import { InternalProvider } from '@metamask/eth-json-rpc-provider';
62
import { JsonRpcEngine } from '@metamask/json-rpc-engine';
73
import type { Json } from '@metamask/utils';
84
import util from 'util';
@@ -98,7 +94,7 @@ function getFakeProvider({
9894
});
9995
}
10096

101-
const provider = providerFromEngine(new JsonRpcEngine());
97+
const provider = new InternalProvider({ engine: new JsonRpcEngine() });
10298
jest
10399
.spyOn(provider, 'request')
104100
.mockImplementation(async (eip1193Request): Promise<Json> => {

packages/eth-json-rpc-middleware/test/util/helpers.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { PollingBlockTracker } from '@metamask/eth-block-tracker';
2-
import {
3-
providerFromEngine,
4-
type InternalProvider,
5-
} from '@metamask/eth-json-rpc-provider';
2+
import { InternalProvider } from '@metamask/eth-json-rpc-provider';
63
import {
74
JsonRpcEngine,
85
type JsonRpcMiddleware,
@@ -96,7 +93,7 @@ export function createFinalMiddlewareWithDefaultResult<
9693
*/
9794
export function createProviderAndBlockTracker() {
9895
const engine = new JsonRpcEngine();
99-
const provider = providerFromEngine(engine);
96+
const provider = new InternalProvider({ engine });
10097

10198
const blockTracker = new PollingBlockTracker({
10299
provider,

packages/eth-json-rpc-provider/CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
- `SafeEventEmitterProvider` is for now still exported as a deprecated alias of `InternalProvider` for backwards compatibility.
1515
- **BREAKING:** Use `JsonRpcServer` instead of `JsonRpcEngine` ([#7001](https://github.com/MetaMask/core/pull/7001))
1616
- Adds a new `server` constructor option to the `InternalProvider` class, mutually exclusive with the now deprecated `engine` option.
17-
- Legacy `JsonRpcEngine` instances are wrapped in a `JsonRpcServer` internally
18-
wherever they appear. Due to differences in error serialization, this may be
19-
breaking for consumers.
17+
- Legacy `JsonRpcEngine` instances are wrapped in a `JsonRpcServer` internally wherever they appear.
18+
This change should mostly be unobservable. However, due to differences in error handling, this may be breaking for consumers.
19+
20+
### Removed
21+
22+
- **BREAKING:** Remove `providerFromEngine` ([#7001](https://github.com/MetaMask/core/pull/7001))
23+
- Use `InternalProvider` directly instead.
2024

2125
## [5.0.1]
2226

packages/eth-json-rpc-provider/src/index.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ describe('Package exports', () => {
66
Array [
77
"InternalProvider",
88
"SafeEventEmitterProvider",
9-
"providerFromEngine",
109
"providerFromMiddleware",
1110
"providerFromMiddlewareV2",
1211
]

packages/eth-json-rpc-provider/src/provider-from-engine.test.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

packages/eth-json-rpc-provider/src/provider-from-engine.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/network-controller/src/create-network-client.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import {
1212
createFetchMiddleware,
1313
createRetryOnEmptyMiddleware,
1414
} from '@metamask/eth-json-rpc-middleware';
15-
import type { InternalProvider } from '@metamask/eth-json-rpc-provider';
1615
import {
17-
providerFromEngine,
16+
InternalProvider,
1817
providerFromMiddleware,
1918
} from '@metamask/eth-json-rpc-provider';
2019
import {
@@ -174,7 +173,7 @@ export function createNetworkClient({
174173

175174
engine.push(networkMiddleware);
176175

177-
const provider = providerFromEngine(engine);
176+
const provider = new InternalProvider({ engine });
178177

179178
const destroy = () => {
180179
// TODO: Either fix this lint violation or explain why it's necessary to ignore.

0 commit comments

Comments
 (0)