remove cwPriceServiceConnection

Author: 0xfirefist

price_pusher/package-lock.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@injectivelabs/sdk-ts": "^1.0.457",
-    "@pythnetwork/pyth-common-js": "^1.2.0",
+    "@pythnetwork/pyth-common-js": "^1.4.0",
     "@pythnetwork/pyth-evm-js": "^1.1.0",
     "@pythnetwork/pyth-sdk-solidity": "^2.2.0",
     "@truffle/hdwallet-provider": "^2.1.3",

price_pusher/package.json

@@ -14,11 +14,7 @@ import { PythPriceListener } from "./pyth-price-listener";
 import fs from "fs";
 import { readPriceConfigFile } from "./price-config";
 import { PriceServiceConnection } from "@pythnetwork/pyth-common-js";
-import {
-  CwPriceServiceConnection,
-  InjectivePriceListener,
-  InjectivePricePusher,
-} from "./injective";
+import { InjectivePriceListener, InjectivePricePusher } from "./injective";
 
 const argv = yargs(hideBin(process.argv))
   .option("network", {
@@ -108,9 +104,7 @@ async function injectiveRun() {
   );
 
   const injectivePricePusher = new InjectivePricePusher(
-    new CwPriceServiceConnection(argv.priceEndpoint, {
-      logger: console,
-    }),
+    connection,
     argv.pythContract,
     argv.endpoint,
     fs.readFileSync(argv.mnemonicFile, "utf-8").trim()

price_pusher/src/index.ts

@@ -1,8 +1,4 @@
-import {
-  HexString,
-  PriceServiceConnection,
-  PriceServiceConnectionConfig,
-} from "@pythnetwork/pyth-common-js";
+import { HexString, PriceServiceConnection } from "@pythnetwork/pyth-common-js";
 import { ChainPricePusher, PriceInfo, PriceListener } from "./interface";
 import { DurationInSeconds } from "./utils";
 import { PriceConfig } from "./price-config";
@@ -124,7 +120,7 @@ export class InjectivePriceListener implements PriceListener {
 export class InjectivePricePusher implements ChainPricePusher {
   private wallet: PrivateKey;
   constructor(
-    private cwPriceServiceConnection: CwPriceServiceConnection,
+    private priceServiceConnection: PriceServiceConnection,
     private pythContract: string,
     private grpcEndpoint: string,
     mnemonic: string
@@ -164,6 +160,16 @@ export class InjectivePricePusher implements ChainPricePusher {
     return txResponse;
   }
 
+  async getPriceFeedUpdateObject(priceIds: string[]): Promise<any> {
+    const vaas = await this.priceServiceConnection.getLatestVaas(priceIds);
+
+    return {
+      update_price_feeds: {
+        data: vaas,
+      },
+    };
+  }
+
   async updatePriceFeed(
     priceIds: string[],
     pubTimesToPush: number[]
@@ -178,8 +184,7 @@ export class InjectivePricePusher implements ChainPricePusher {
     let priceFeedUpdateObject;
     try {
       // get the latest VAAs for updatePriceFeed and then push them
-      priceFeedUpdateObject =
-        await this.cwPriceServiceConnection.getPriceFeedUpdateObject(priceIds);
+      priceFeedUpdateObject = await this.getPriceFeedUpdateObject(priceIds);
     } catch (e) {
       console.error("Error fetching the latest vaas to push");
       console.error(e);
@@ -228,20 +233,3 @@ export class InjectivePricePusher implements ChainPricePusher {
     }
   }
 }
-
-// FIXME: a better place for it while refactoring
-export class CwPriceServiceConnection extends PriceServiceConnection {
-  constructor(endpoint: string, config?: PriceServiceConnectionConfig) {
-    super(endpoint, config);
-  }
-
-  async getPriceFeedUpdateObject(priceIds: string[]): Promise<any> {
-    const vaas = await this.getLatestVaas(priceIds);
-
-    return {
-      update_price_feeds: {
-        data: vaas,
-      },
-    };
-  }
-}