refactor: remove this.- and replace it to ClassName.- expression …

…for static variables
initia-labs · Dec 17, 2024 · e552835 · e552835
1 parent 677fa94
commit e552835
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 68 deletions.
diff --git a/src/db/controller/channel.ts b/src/db/controller/channel.ts
@@ -87,7 +87,7 @@ export class ChannelController {
 
     return select<ChannelOpenCloseTable>(
       DB,
-      this.tableName,
+      ChannelController.tableName,
       wheres,
       { id: 'ASC' },
       limit
@@ -103,23 +103,23 @@ export class ChannelController {
 
     del<ChannelOpenCloseTable>(
       DB,
-      this.tableName,
+      ChannelController.tableName,
       events.map((v) => ({ id: v.id as number }))
     )
   }
 
   public static updateInProgress(id?: number, inProgress = true) {
     update<ChannelOpenCloseTable>(
       DB,
-      this.tableName,
+      ChannelController.tableName,
       { in_progress: inProgress ? Bool.TRUE : Bool.FALSE },
       [{ id }]
     )
   }
 
   public static resetPacketInProgress(db?: Database) {
     db = db ?? DB
-    update<ChannelOpenCloseTable>(db, this.tableName, {
+    update<ChannelOpenCloseTable>(db, ChannelController.tableName, {
       in_progress: Bool.FALSE,
     })
   }
@@ -152,7 +152,7 @@ export class ChannelController {
     }
 
     return () => {
-      insert(DB, this.tableName, channelOnOpen) // store INIT state to the dst chain
+      insert(DB, ChannelController.tableName, channelOnOpen) // store INIT state to the dst chain
     }
   }
 
@@ -184,15 +184,15 @@ export class ChannelController {
     }
 
     return () => {
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.INIT,
           counterparty_chain_id: connection.counterparty_chain_id,
           counterparty_port_id: channelOnOpen.port_id,
           counterparty_channel_id: channelOnOpen.channel_id,
         },
       ]) // remove INIT from the dst chain
-      insert(DB, this.tableName, channelOnOpen) // store TRYOPEN state to the src chain
+      insert(DB, ChannelController.tableName, channelOnOpen) // store TRYOPEN state to the src chain
     }
   }
 
@@ -224,23 +224,23 @@ export class ChannelController {
     }
 
     return () => {
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.TRYOPEN,
           counterparty_chain_id: channelOnOpen.chain_id,
           counterparty_port_id: channelOnOpen.port_id,
           counterparty_channel_id: channelOnOpen.channel_id,
         },
       ]) // remove TRYOPEN from src chain
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.INIT,
           counterparty_chain_id: chainId,
           counterparty_port_id: channelOnOpen.counterparty_port_id,
           counterparty_channel_id: channelOnOpen.counterparty_channel_id,
         },
       ]) // remove INIT from dst chain
-      insert(DB, this.tableName, channelOnOpen) // store ACK state to the dst chain
+      insert(DB, ChannelController.tableName, channelOnOpen) // store ACK state to the dst chain
     }
   }
 
@@ -256,15 +256,15 @@ export class ChannelController {
       event.channelOpenCloseInfo.dstConnectionId
     )
     return () => {
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.TRYOPEN,
           counterparty_chain_id: chainId,
           counterparty_port_id: event.channelOpenCloseInfo.dstPortId,
           counterparty_channel_id: event.channelOpenCloseInfo.dstChannelId,
         },
       ]) // remove TRYOPEN from src chain
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.ACK,
           counterparty_chain_id: connection.counterparty_chain_id,
@@ -302,7 +302,7 @@ export class ChannelController {
     }
 
     return () => {
-      insert(DB, this.tableName, channelOnOpen)
+      insert(DB, ChannelController.tableName, channelOnOpen)
 
       // Mark all packets as timed out
       PacketController.updateTimeout(
@@ -318,7 +318,7 @@ export class ChannelController {
     event: ChannelOpenCloseEvent
   ): () => void {
     return () => {
-      del<ChannelOpenCloseTable>(DB, this.tableName, [
+      del<ChannelOpenCloseTable>(DB, ChannelController.tableName, [
         {
           state: ChannelState.CLOSE,
           chain_id: chainId,

diff --git a/src/db/controller/client.ts b/src/db/controller/client.ts
@@ -27,7 +27,7 @@ export class ClientController {
       last_update_time: 0,
     }
 
-    insert(DB, this.tableName, client)
+    insert(DB, ClientController.tableName, client)
 
     return client
   }
@@ -68,7 +68,7 @@ export class ClientController {
 
     update<ClientTable>(
       DB,
-      this.tableName,
+      ClientController.tableName,
       {
         revision_height: client.revision_height,
         last_update_time: client.last_update_time,
@@ -88,7 +88,7 @@ export class ClientController {
     clientId: string
   ): Promise<ClientTable> {
     // get client
-    const client = selectOne<ClientTable>(DB, this.tableName, [
+    const client = selectOne<ClientTable>(DB, ClientController.tableName, [
       {
         chain_id: chainId,
         client_id: clientId,
@@ -104,7 +104,7 @@ export class ClientController {
   ): ClientTable[] {
     const clients = select<ClientTable>(
       DB,
-      this.tableName,
+      ClientController.tableName,
       counterpartyChainIds.map((counterpartyChainId) => ({
         chain_id: chainId,
         counterparty_chain_id: counterpartyChainId,

diff --git a/src/db/controller/connection.ts b/src/db/controller/connection.ts
@@ -25,7 +25,7 @@ export class ConnectionController {
       counterparty_client_id: connectionInfo.connection.counterparty.client_id,
     }
 
-    insert(DB, this.tableName, connection)
+    insert(DB, ConnectionController.tableName, connection)
 
     return connection
   }
@@ -37,12 +37,16 @@ export class ConnectionController {
     chainId: string,
     connectionId: string
   ): Promise<ConnectionTable> {
-    const connection = selectOne<ConnectionTable>(DB, this.tableName, [
-      {
-        chain_id: chainId,
-        connection_id: connectionId,
-      },
-    ])
+    const connection = selectOne<ConnectionTable>(
+      DB,
+      ConnectionController.tableName,
+      [
+        {
+          chain_id: chainId,
+          connection_id: connectionId,
+        },
+      ]
+    )
 
     return connection ?? this.addConnection(rest, chainId, connectionId)
   }

diff --git a/src/db/controller/packet.ts b/src/db/controller/packet.ts
@@ -104,7 +104,7 @@ export class PacketController {
       res.push(
         ...select<PacketSendTable>(
           DB,
-          this.tableNamePacketSend,
+          PacketController.tableNamePacketSend,
           wheres,
           { sequence: 'ASC' },
           limit - res.length
@@ -159,7 +159,7 @@ export class PacketController {
 
     return select<PacketTimeoutTable>(
       DB,
-      this.tableNamePacketTimeout,
+      PacketController.tableNamePacketTimeout,
       wheres,
       { sequence: 'ASC' },
       limit
@@ -207,7 +207,7 @@ export class PacketController {
 
     return select<PacketWriteAckTable>(
       DB,
-      this.tableNamePacketWriteAck,
+      PacketController.tableNamePacketWriteAck,
       wheres,
       { sequence: 'ASC' },
       limit
@@ -218,7 +218,7 @@ export class PacketController {
     if (packets.length === 0) return
     del<PacketSendTable>(
       DB,
-      this.tableNamePacketSend,
+      PacketController.tableNamePacketSend,
       packets.map((packet) => ({
         dst_chain_id: packet.dst_chain_id,
         dst_connection_id: packet.dst_connection_id,
@@ -232,7 +232,7 @@ export class PacketController {
     if (packets.length === 0) return
     del<PacketTimeoutTable>(
       DB,
-      this.tableNamePacketTimeout,
+      PacketController.tableNamePacketTimeout,
       packets.map((packet) => ({
         src_chain_id: packet.src_chain_id,
         src_connection_id: packet.src_connection_id,
@@ -246,7 +246,7 @@ export class PacketController {
     if (packets.length === 0) return
     del<PacketWriteAckTable>(
       DB,
-      this.tableNamePacketWriteAck,
+      PacketController.tableNamePacketWriteAck,
       packets.map((packet) => ({
         src_chain_id: packet.src_chain_id,
         src_connection_id: packet.src_connection_id,
@@ -262,7 +262,7 @@ export class PacketController {
   ) {
     update<PacketSendTable>(
       DB,
-      this.tableNamePacketSend,
+      PacketController.tableNamePacketSend,
       { in_progress: inProgress ? Bool.TRUE : Bool.FALSE },
       [
         {
@@ -281,7 +281,7 @@ export class PacketController {
   ) {
     update<PacketTimeoutTable>(
       DB,
-      this.tableNamePacketTimeout,
+      PacketController.tableNamePacketTimeout,
       { in_progress: inProgress ? Bool.TRUE : Bool.FALSE },
       [
         {
@@ -300,7 +300,7 @@ export class PacketController {
   ) {
     update<PacketWriteAckTable>(
       DB,
-      this.tableNamePacketWriteAck,
+      PacketController.tableNamePacketWriteAck,
       { in_progress: inProgress ? Bool.TRUE : Bool.FALSE },
       [
         {
@@ -315,13 +315,13 @@ export class PacketController {
 
   public static resetPacketInProgress(db?: Database) {
     db = db ?? DB
-    update<PacketSendTable>(db, this.tableNamePacketSend, {
+    update<PacketSendTable>(db, PacketController.tableNamePacketSend, {
       in_progress: Bool.FALSE,
     })
-    update<PacketTimeoutTable>(db, this.tableNamePacketTimeout, {
+    update<PacketTimeoutTable>(db, PacketController.tableNamePacketTimeout, {
       in_progress: Bool.FALSE,
     })
-    update<PacketWriteAckTable>(db, this.tableNamePacketWriteAck, {
+    update<PacketWriteAckTable>(db, PacketController.tableNamePacketWriteAck, {
       in_progress: Bool.FALSE,
     })
   }
@@ -382,14 +382,14 @@ export class PacketController {
     }
 
     return () => {
-      insert(DB, this.tableNamePacketSend, packetSend)
-      insert(DB, this.tableNamePacketTimeout, packetTimeout)
+      insert(DB, PacketController.tableNamePacketSend, packetSend)
+      insert(DB, PacketController.tableNamePacketTimeout, packetTimeout)
 
       // if channel is ordered channel, update in progress for higher sequence
       if (packetSend.is_ordered === Bool.TRUE) {
         update<PacketSendTable>(
           DB,
-          this.tableNamePacketSend,
+          PacketController.tableNamePacketSend,
           { in_progress: Bool.FALSE },
           [
             {
@@ -438,7 +438,7 @@ export class PacketController {
     }
     return () => {
       // remove pakcet send
-      del<PacketSendTable>(DB, this.tableNamePacketSend, [
+      del<PacketSendTable>(DB, PacketController.tableNamePacketSend, [
         {
           dst_chain_id: chainId,
           dst_channel_id: event.packetInfo.dstChannel,
@@ -460,13 +460,13 @@ export class PacketController {
         FeeType.TIMEOUT
       )
 
-      insert(DB, this.tableNamePacketWriteAck, packetWriteAck)
+      insert(DB, PacketController.tableNamePacketWriteAck, packetWriteAck)
 
       // if channel is ordered channel, update in progress for higher sequence
       if (packetWriteAck.is_ordered === Bool.TRUE) {
         update<PacketSendTable>(
           DB,
-          this.tableNamePacketSend,
+          PacketController.tableNamePacketSend,
           { in_progress: Bool.FALSE },
           [
             {
@@ -493,7 +493,7 @@ export class PacketController {
 
     return () => {
       // remove pakcet send
-      del<PacketSendTable>(DB, this.tableNamePacketSend, [
+      del<PacketSendTable>(DB, PacketController.tableNamePacketSend, [
         {
           dst_chain_id: connection.counterparty_chain_id,
           dst_connection_id: connection.counterparty_connection_id,
@@ -503,7 +503,7 @@ export class PacketController {
       ])
 
       // remove packet timeout
-      del<PacketTimeoutTable>(DB, this.tableNamePacketSend, [
+      del<PacketTimeoutTable>(DB, PacketController.tableNamePacketSend, [
         {
           src_chain_id: chainId,
           src_connection_id: event.packetInfo.connectionId,
@@ -513,7 +513,7 @@ export class PacketController {
       ])
 
       // remove packet write ack
-      del<PacketWriteAckTable>(DB, this.tableNamePacketSend, [
+      del<PacketWriteAckTable>(DB, PacketController.tableNamePacketSend, [
         {
           src_chain_id: chainId,
           src_connection_id: event.packetInfo.connectionId,
@@ -557,7 +557,7 @@ export class PacketController {
     )
     return () => {
       // remove pakcet send
-      del<PacketSendTable>(DB, this.tableNamePacketSend, [
+      del<PacketSendTable>(DB, PacketController.tableNamePacketSend, [
         {
           dst_chain_id: connection.counterparty_chain_id,
           dst_connection_id: connection.counterparty_connection_id,
@@ -567,7 +567,7 @@ export class PacketController {
       ])
 
       // remove packet timeout
-      del<PacketTimeoutTable>(DB, this.tableNamePacketSend, [
+      del<PacketTimeoutTable>(DB, PacketController.tableNamePacketSend, [
         {
           src_chain_id: chainId,
           src_connection_id: event.packetInfo.connectionId,

diff --git a/src/db/controller/packetFee.ts b/src/db/controller/packetFee.ts
@@ -26,7 +26,7 @@ export class PacketFeeController {
             denom: coin.denom,
             amount: Number(coin.amount),
           }
-          insert(DB, this.tableName, packetFee)
+          insert(DB, PacketFeeController.tableName, packetFee)
         }
       }
     }
@@ -52,7 +52,7 @@ export class PacketFeeController {
     sequence: number,
     type: FeeType
   ) {
-    del<PacketFeeTable>(DB, this.tableName, [
+    del<PacketFeeTable>(DB, PacketFeeController.tableName, [
       { chain_id: chainId, channel_id: channelId, sequence, fee_type: type },
     ])
   }