fix(contracttxid): make contractTxID require in remote state cache in…

…stance
ar-io · Feb 26, 2024 · dc82d21 · dc82d21
1 parent e92da07
commit dc82d21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 39 deletions.
diff --git a/src/common/ar-io.ts b/src/common/ar-io.ts
@@ -18,18 +18,29 @@ import {
   ARNS_DEVNET_REGISTRY_TX,
   ARNS_TESTNET_REGISTRY_TX,
 } from '../constants.js';
-import { ArIOContract, ContractCache } from '../types/index.js';
+import { ArIOContract } from '../types/index.js';
 import { ArNSRemoteCache } from './index.js';
 
 export class ArIO {
-  protected cache: ContractCache = new ArNSRemoteCache({});
+  protected cache: ArIOContract = new ArNSRemoteCache({
+    contractTxId: ARNS_TESTNET_REGISTRY_TX,
+  });
 
   public testnet: ArIOContract;
   public devnet: ArIOContract;
 
   constructor({ remoteCacheUrl }: { remoteCacheUrl?: string }) {
-    this.cache = new ArNSRemoteCache({ url: remoteCacheUrl });
-    this.testnet = this.cache.setContractTxId(ARNS_TESTNET_REGISTRY_TX);
-    this.devnet = this.cache.setContractTxId(ARNS_DEVNET_REGISTRY_TX);
+    this.cache = new ArNSRemoteCache({
+      url: remoteCacheUrl,
+      contractTxId: ARNS_TESTNET_REGISTRY_TX,
+    });
+    this.testnet = new ArNSRemoteCache({
+      contractTxId: ARNS_TESTNET_REGISTRY_TX,
+      url: remoteCacheUrl,
+    });
+    this.devnet = new ArNSRemoteCache({
+      contractTxId: ARNS_DEVNET_REGISTRY_TX,
+      url: remoteCacheUrl,
+    });
   }
 }
diff --git a/src/common/caches/arns-remote-cache.ts b/src/common/caches/arns-remote-cache.ts
@@ -18,15 +18,14 @@ import { ARNS_TESTNET_REGISTRY_TX } from '../../constants.js';
 import {
   ArIOContract,
   ArNSStateResponse,
-  ContractCache,
   Gateway,
   HTTPClient,
 } from '../../types/index.js';
 import { NotFound } from '../error.js';
 import { AxiosHTTPService } from '../http.js';
 import { DefaultLogger } from '../logger.js';
 
-export class ArNSRemoteCache implements ContractCache, ArIOContract {
+export class ArNSRemoteCache implements ArIOContract {
   private contractTxId: string;
   private logger: DefaultLogger;
   private http: HTTPClient;
@@ -37,29 +36,21 @@ export class ArNSRemoteCache implements ContractCache, ArIOContract {
       level: 'debug',
       logFormat: 'simple',
     }),
+    contractTxId = ARNS_TESTNET_REGISTRY_TX,
   }: {
     url?: string;
     logger?: DefaultLogger;
+    contractTxId?: string;
   }) {
-    this.contractTxId = ARNS_TESTNET_REGISTRY_TX;
+    this.contractTxId = contractTxId;
     this.logger = logger;
     this.http = new AxiosHTTPService({
       url: `${url}/${this.apiVersion}`,
       logger,
     });
   }
 
-  setContractTxId(contractTxId: string): ArIOContract {
-    this.contractTxId = contractTxId;
-    return this;
-  }
-
   async getGateway({ address }: { address: string }) {
-    if (!this.contractTxId) {
-      throw new Error(
-        'Contract TxId not set, set one before calling this function.',
-      );
-    }
     this.logger.debug(`Fetching gateway ${address}`);
     const gateway = await this.getGateways().then((gateways) => {
       if (gateways[address] === undefined) {
@@ -71,11 +62,6 @@ export class ArNSRemoteCache implements ContractCache, ArIOContract {
   }
 
   async getGateways() {
-    if (!this.contractTxId) {
-      throw new Error(
-        'Contract TxId not set, set one before calling this function.',
-      );
-    }
     this.logger.debug(`Fetching gateways`);
     const { result } = await this.http.get<
       ArNSStateResponse<'result', Record<string, Gateway>>
@@ -86,11 +72,6 @@ export class ArNSRemoteCache implements ContractCache, ArIOContract {
   }
 
   async getBalance({ address }: { address: string }) {
-    if (!this.contractTxId) {
-      throw new Error(
-        'Contract TxId not set, set one before calling this function.',
-      );
-    }
     this.logger.debug(`Fetching balance for ${address}`);
     const { result } = await this.http
       .get<ArNSStateResponse<'result', number>>({
@@ -106,11 +87,6 @@ export class ArNSRemoteCache implements ContractCache, ArIOContract {
   }
 
   async getBalances() {
-    if (!this.contractTxId) {
-      throw new Error(
-        'Contract TxId not set, set one before calling this function.',
-      );
-    }
     this.logger.debug(`Fetching balances`);
     const { result } = await this.http.get<
       ArNSStateResponse<'result', Record<string, number>>

diff --git a/src/types/common.ts b/src/types/common.ts
@@ -16,12 +16,6 @@
  */
 import { Gateway } from './contract-state.js';
 
-export interface ContractCache {
-  /**
-   * The ContractCache interface is used to define a contract state provider.
-   */
-  setContractTxId(contractTxId: string): ArIOContract;
-}
 // TODO: extend with additional methods
 export interface ArIOContract {
   getGateway({ address }: { address: WalletAddress }): Promise<Gateway>;