chore: renames L2ToL1MessageClassic to Child/ParentChain (#352)

OffchainLabs · Mar 14, 2024 · 551ba58 · 551ba58
1 parent e1a4c24
commit 551ba58
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 114 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -56,7 +56,7 @@ export { InboxTools } from './lib/inbox/inbox'
 export { EventFetcher } from './lib/utils/eventFetcher'
 export { ArbitrumProvider } from './lib/utils/arbProvider'
 export * as constants from './lib/dataEntities/constants'
-export { L2ToL1MessageStatus } from './lib/dataEntities/message'
+export { ChildToParentMessageStatus } from './lib/dataEntities/message'
 export {
   RetryableData,
   RetryableDataTools,

diff --git a/src/lib/dataEntities/message.ts b/src/lib/dataEntities/message.ts
@@ -53,7 +53,7 @@ export enum InboxMessageKind {
   L2MessageType_signedTx = 4,
 }
 
-export enum L2ToL1MessageStatus {
+export enum ChildToParentMessageStatus {
   /**
    * ArbSys.sendTxToL1 called, but assertion not yet confirmed
    */

diff --git a/src/lib/message/L2ToL1Message.ts b/src/lib/message/L2ToL1Message.ts
@@ -34,7 +34,7 @@ import {
 } from '../abi/ArbSys'
 import { isDefined } from '../utils/lib'
 import { EventArgs } from '../dataEntities/event'
-import { L2ToL1MessageStatus as ChildToParentChainMessageStatus } from '../dataEntities/message'
+import { ChildToParentMessageStatus } from '../dataEntities/message'
 import { getChildChain } from '../dataEntities/networks'
 import { ArbSdkError } from '../dataEntities/errors'
 
@@ -160,7 +160,7 @@ export class ChildToParentMessage {
     const logQueries = []
     if (classicFilter.fromBlock !== classicFilter.toBlock) {
       logQueries.push(
-        classic.L2ToL1MessageClassic.getL2ToL1Events(
+        classic.ChildToParentMessageClassic.getChildToParentEvents(
           childChainProvider,
           classicFilter,
           position,
@@ -195,7 +195,7 @@ export class ChildToParentMessage {
  * Provides read-only access for Chain-to-ParentChain-messages
  */
 export class ChildToParentMessageReader extends ChildToParentMessage {
-  private readonly classicReader?: classic.L2ToL1MessageReaderClassic
+  private readonly classicReader?: classic.ChildToParentMessageReaderClassic
   private readonly nitroReader?: nitro.ChildToParentChainMessageReaderNitro
 
   constructor(
@@ -204,7 +204,7 @@ export class ChildToParentMessageReader extends ChildToParentMessage {
   ) {
     super()
     if (this.isClassic(event)) {
-      this.classicReader = new classic.L2ToL1MessageReaderClassic(
+      this.classicReader = new classic.ChildToParentMessageReaderClassic(
         parentChainProvider,
         event.batchNumber,
         event.indexInBatch
@@ -232,7 +232,7 @@ export class ChildToParentMessageReader extends ChildToParentMessage {
    */
   public async status(
     childChainProvider: Provider
-  ): Promise<ChildToParentChainMessageStatus> {
+  ): Promise<ChildToParentMessageStatus> {
     // can we create an ChildToParentmessage here, we need to - the constructor is what we need
     if (this.nitroReader)
       return await this.nitroReader.status(childChainProvider)
@@ -250,8 +250,7 @@ export class ChildToParentMessageReader extends ChildToParentMessage {
     childChainProvider: Provider,
     retryDelay = 500
   ): Promise<
-    | ChildToParentChainMessageStatus.EXECUTED
-    | ChildToParentChainMessageStatus.CONFIRMED
+    ChildToParentMessageStatus.EXECUTED | ChildToParentMessageStatus.CONFIRMED
   > {
     if (this.nitroReader)
       return this.nitroReader.waitUntilReadyToExecute(
@@ -284,7 +283,7 @@ export class ChildToParentMessageReader extends ChildToParentMessage {
  * Provides read and write access for Chain-to-ParentChain-messages
  */
 export class ChildToParentMessageWriter extends ChildToParentMessageReader {
-  private readonly classicWriter?: classic.L2ToL1MessageWriterClassic
+  private readonly classicWriter?: classic.ChildToParentMessageWriterClassic
   private readonly nitroWriter?: nitro.ChildToParentChainMessageWriterNitro
 
   /**
@@ -302,7 +301,7 @@ export class ChildToParentMessageWriter extends ChildToParentMessageReader {
     super(parentChainProvider ?? parentChainSigner.provider!, event)
 
     if (this.isClassic(event)) {
-      this.classicWriter = new classic.L2ToL1MessageWriterClassic(
+      this.classicWriter = new classic.ChildToParentMessageWriterClassic(
         parentChainSigner,
         event.batchNumber,
         event.indexInBatch,