fix: remove protocol config options

Currently there are not many wss rpcs. most of the available ones are not responding. Skip them for now.
ubiquity · Jun 16, 2024 · e3cd0f0 · e3cd0f0
1 parent 1a8b6e7
commit e3cd0f0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/tests/benchmark.test.ts b/tests/benchmark.test.ts
@@ -11,7 +11,6 @@ export const testConfig: HandlerConstructorConfig = {
   rpcTimeout: 1500,
   runtimeRpcs: null,
   tracking: "yes",
-  protocol: "all",
 };
 
 describe("RPCHandler", () => {

diff --git a/tests/rpc-handler.test.ts b/tests/rpc-handler.test.ts
@@ -12,7 +12,6 @@ export const testConfig: HandlerConstructorConfig = {
   rpcTimeout: 1500,
   runtimeRpcs: null,
   tracking: "yes",
-  protocol: "all",
 };
 
 describe("RPCHandler", () => {

diff --git a/types/handler.ts b/types/handler.ts
@@ -1,6 +1,6 @@
 import { JsonRpcProvider } from "@ethersproject/providers";
 import { ChainId, networkCurrencies, networkExplorers, networkIds, networkNames, networkRpcs, networkRpcsOriginal, tokens } from "./constants";
-import { Protocol, RpcType, Tracking } from "./shared";
+import { RpcType, Tracking } from "./shared";
 
 export type ValidBlockData = {
   jsonrpc: string;
@@ -39,7 +39,6 @@ export type HandlerConstructorConfig = {
   runtimeRpcs: string[] | null;
   rpcTimeout: number | null;
   tracking: Tracking;
-  protocol: Protocol;
 };
 
 export type NetworkRPCs = typeof networkRpcs;

diff --git a/types/rpc-handler.ts b/types/rpc-handler.ts
@@ -4,7 +4,7 @@ import { HandlerInterface, HandlerConstructorConfig } from "./handler";
 
 import { RPCService } from "../src/services/rpc-service";
 import { StorageService } from "../src/services/storage-service";
-import { Protocol, RpcType, Tracking, getRpcUrls } from "./shared";
+import { RpcType, Tracking, getRpcUrls } from "./shared";
 
 export class RPCHandler implements HandlerInterface {
   private static _instance: RPCHandler | null = null;
@@ -25,13 +25,13 @@ export class RPCHandler implements HandlerInterface {
 
   constructor(config: HandlerConstructorConfig) {
     this._networkId = config.networkId;
-    this._networkRpcs = this.filterNetworks(networkRpcsOriginal[this._networkId], config.tracking, config.protocol);
+    this._networkRpcs = this.filterNetworks(networkRpcsOriginal[this._networkId], config.tracking);
     this._networkName = networkNames[this._networkId];
     this._initialize(config);
   }
 
-  public filterNetworks(networks: RpcType[], tracking: Tracking, protocol: Protocol) {
-    const trackingFilteredRpc = networks.filter((rpc) => {
+  public filterNetworks(networks: RpcType[], tracking: Tracking) {
+    const filteredRpcs = networks.filter((rpc) => {
       if (tracking == "yes") {
         return true;
       } else if (tracking == "limited" && typeof rpc != "string") {
@@ -41,22 +41,7 @@ export class RPCHandler implements HandlerInterface {
       }
       return false;
     });
-
-    const fullyFilteredRpcs = trackingFilteredRpc.filter((rpc) => {
-      if (protocol == "all") {
-        return true;
-      }
-
-      const url = typeof rpc == "string" ? rpc : rpc.url;
-      if (protocol == "https") {
-        return url.indexOf("https") === 0;
-      } else if (protocol == "wss") {
-        return url.indexOf("wss") === 0;
-      }
-      return false;
-    });
-
-    return fullyFilteredRpcs;
+    return filteredRpcs;
   }
 
   public async getFastestRpcProvider(): Promise<JsonRpcProvider> {

diff --git a/types/shared.ts b/types/shared.ts
@@ -1,5 +1,4 @@
 export type Tracking = "yes" | "limited" | "none";
-export type Protocol = "all" | "https" | "wss";
 
 export type RpcType =
   | string // if string then it is the official rpc of the chain