Merge pull request ConsenSys-archive#2490 from trufflesuite/hotFixShim

Internal Improvement: Enable backwards compatible provider during testing

Author: CruzMolina

packages/core/lib/test.js

@@ -41,6 +41,8 @@ const Test = {
  const web3 = new Web3Shim({
  provider: config.provider,
  networkType: config.networks[config.network].type
+ ? config.networks[config.network].type
+ : "web3js"
  });
 
  // Override console.warn() because web3 outputs gross errors to it.

packages/interface-adapter/lib/web3-js-definition.ts

@@ -0,0 +1,6 @@
+import { Web3Shim } from "./web3-shim";
+
+// We simply return plain ol' Web3.js
+export const Web3JsDefinition = {
+ async initNetworkType(web3: Web3Shim) {}
+};

packages/interface-adapter/lib/web3-shim.ts

@@ -4,17 +4,20 @@ import { Provider } from "web3/providers";
 import { EthereumDefinition } from "./ethereum-overloads";
 import { QuorumDefinition } from "./quorum-overloads";
 import { FabricEvmDefinition } from "./fabric-evm-overloads";
-
-const initInterface = async(web3Shim: Web3Shim) => {
-
- const networkTypes: NetworkTypesConfig = new Map(Object.entries({
- "ethereum": EthereumDefinition,
- "quorum": QuorumDefinition,
+import { Web3JsDefinition } from "./web3-js-definition";
+
+const initInterface = async (web3Shim: Web3Shim) => {
+ const networkTypes: NetworkTypesConfig = new Map(
+ Object.entries({
+ web3js: Web3JsDefinition,
+ ethereum: EthereumDefinition,
+ quorum: QuorumDefinition,
  "fabric-evm": FabricEvmDefinition
- }));
+ })
+ );
 
-  networkTypes.get(web3Shim.networkType).initNetworkType(web3Shim);
- }
+ networkTypes.get(web3Shim.networkType).initNetworkType(web3Shim);
+};
 
 // March 13, 2019 - Mike Seese:
 // This is a temporary shim to support the basic, Ethereum-based
@@ -27,12 +30,12 @@ export type NetworkType = string;
 export interface Web3ShimOptions {
  provider?: Provider;
  networkType?: NetworkType;
-};
+}
 
 export type InitNetworkType = (web3Shim: Web3Shim) => Promise<void>;
 
 export interface NetworkTypeDefinition {
- initNetworkType: InitNetworkType
+ initNetworkType: InitNetworkType;
 }
 
 export type NetworkTypesConfig = Map<NetworkType, NetworkTypeDefinition>;
@@ -75,4 +78,4 @@ export class Web3Shim extends Web3 {
  this.networkType = networkType;
  initInterface(this);
  }
-};
+}