fix(request-client): remove useLocalEthereumBroadcast from tests (#937)

alexandre-abrioux · web-flow · commit a9e3f3e09384 · 2022-10-10T09:48:35.000+02:00
diff --git a/packages/request-client.js/src/http-metamask-data-access.ts b/packages/request-client.js/src/http-metamask-data-access.ts
@@ -52,7 +52,7 @@ export default class HttpMetaMaskDataAccess extends HttpDataAccess {
 
     // Creates a local or default provider
     this.provider = web3
-      ? new ethers.providers.Web3Provider(web3.currentProvider)
+      ? new ethers.providers.Web3Provider(web3)
       : new ethers.providers.JsonRpcProvider({ url: ethereumProviderUrl });
   }
 
diff --git a/packages/request-client.js/src/http-request-network.ts b/packages/request-client.js/src/http-request-network.ts
@@ -23,7 +23,6 @@ export default class HttpRequestNetwork extends RequestNetwork {
    * @param options.nodeConnectionConfig Configuration options to connect to the node. Follows Axios configuration format.
    * @param options.useMockStorage When true, will use a mock storage in memory. Meant to simplify local development and should never be used in production.
    * @param options.signatureProvider Module to handle the signature. If not given it will be impossible to create new transaction (it requires to sign).
-   * @param options.useLocalEthereumBroadcast When true, persisting use the node only for IPFS but persisting on ethereum through local provider (given in ethereumProviderUrl).
    * @param options.currencies custom currency list
    * @param options.currencyManager custom currency manager (will override `currencies`)
    */
@@ -43,14 +42,12 @@ export default class HttpRequestNetwork extends RequestNetwork {
       nodeConnectionConfig?: AxiosRequestConfig;
       signatureProvider?: SignatureProviderTypes.ISignatureProvider;
       useMockStorage?: boolean;
-      useLocalEthereumBroadcast?: boolean;
       currencies?: CurrencyInput[];
       currencyManager?: ICurrencyManager;
       paymentOptions?: PaymentNetworkOptions;
     } = {
       httpConfig: {},
       nodeConnectionConfig: {},
-      useLocalEthereumBroadcast: false,
       useMockStorage: false,
     },
   ) {
diff --git a/packages/request-client.js/src/index.ts b/packages/request-client.js/src/index.ts
@@ -4,6 +4,15 @@ import Request from './api/request';
 import Utils from './api/utils';
 import { default as RequestNetwork } from './http-request-network';
 import { default as RequestNetworkBase } from './api/request-network';
+import { default as HttpMetaMaskDataAccess } from './http-metamask-data-access';
 import * as Types from './types';
 
-export { PaymentReferenceCalculator, Request, RequestNetwork, RequestNetworkBase, Types, Utils };
+export {
+  PaymentReferenceCalculator,
+  Request,
+  RequestNetwork,
+  RequestNetworkBase,
+  HttpMetaMaskDataAccess,
+  Types,
+  Utils,
+};
diff --git a/packages/request-client.js/test/index-persist-from-metamask.html b/packages/request-client.js/test/index-persist-from-metamask.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>@requestnetwork/request-client.js Test Page</title>
+    <script src="https://unpkg.com/@metamask/detect-provider/dist/detect-provider.min.js"></script>
     <script src="..\..\request-client.js\dist\requestnetwork.min.js"></script>
     <script src="..\..\web3-signature\dist\web3-signature.min.js"></script>
   </head>
@@ -13,25 +14,10 @@ <h2>Important</h2>
     <p>The dependencies must be built. (yarn build)</p>
     <script>
       window.addEventListener('load', async () => {
-        // Modern dapp browsers...
-        if (window.ethereum) {
-          window.web3 = new Web3(window.ethereum);
-          try {
-            await window.ethereum.enable();
-            startTestSignatureWithMetamask(window.web3);
-          } catch (error) {
-            // User denied account access...
-            console.log(error);
-          }
-        }
-        // Legacy dapp browsers...
-        else if (window.web3) {
-          window.web3 = new Web3(web3.currentProvider);
-
-          startTestSignatureWithMetamask(window.web3);
-        }
-        // Non-dapp browsers...
-        else {
+        const metamaskProvider = await detectEthereumProvider();
+        if (metamaskProvider) {
+          startTestSignatureWithMetamask(metamaskProvider);
+        } else {
           console.log('Non-Ethereum browser detected. You should consider trying MetaMask!');
         }
       });
@@ -73,19 +59,18 @@ <h2>Important</h2>
         };
       }
 
-      async function startTestSignatureWithMetamask(web3) {
+      async function startTestSignatureWithMetamask(web3Provider) {
         const { contentData, paymentNetwork, requestCreationHash, signatureInfo, topics } =
           getMockData();
 
         // Initialize the signature provider
-        const signatureProvider = new Web3SignatureProvider.Web3SignatureProvider(web3);
+        const signatureProvider = new Web3SignatureProvider.Web3SignatureProvider(web3Provider);
 
         // Initialize the library in local test mode
-        const requestNetwork = new RequestNetwork.RequestNetwork({
+        const dataAccess = new RequestNetwork.HttpMetaMaskDataAccess({ web3: web3Provider });
+        const requestNetwork = new RequestNetwork.RequestNetworkBase({
+          dataAccess,
           signatureProvider,
-          // this is a test using the mock storage instead of a real request node
-          useLocalEthereumBroadcast: true,
-          web3: window.web3,
         });
 
         // Create a request

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export default class HttpMetaMaskDataAccess extends HttpDataAccess {`
`52`	`52`
`53`	`53`	`// Creates a local or default provider`
`54`	`54`	`this.provider = web3`
`55`		`- ? new ethers.providers.Web3Provider(web3.currentProvider)`
	`55`	`+ ? new ethers.providers.Web3Provider(web3)`
`56`	`56`	`: new ethers.providers.JsonRpcProvider({ url: ethereumProviderUrl });`
`57`	`57`	`}`
`58`	`58`