Used Hex in mocked bridge

keep-network · Oct 20, 2023 · b471fe5 · b471fe5
1 parent c3213f0
commit b471fe5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 29 deletions.
diff --git a/typescript/test/data/redemption.ts b/typescript/test/data/redemption.ts
@@ -551,7 +551,7 @@ export interface RedemptionProofTestData {
     redemptionTx: BitcoinRawTxVectors
     redemptionProof: BitcoinSpvProof
     mainUtxo: BitcoinUtxo
-    walletPublicKey: string
+    walletPublicKey: Hex
   }
 }
 
@@ -720,8 +720,9 @@ export const redemptionProof: RedemptionProofTestData = {
       outputIndex: 1,
       value: BigNumber.from(1429580),
     },
-    walletPublicKey:
-      "03989d253b17a6a0f41838b84ff0d20e8898f9d7b1a98f2564da4cc29dcf8581d9",
+    walletPublicKey: Hex.from(
+      "03989d253b17a6a0f41838b84ff0d20e8898f9d7b1a98f2564da4cc29dcf8581d9"
+    ),
   },
 }
 

diff --git a/typescript/test/services/maintenance.test.ts b/typescript/test/services/maintenance.test.ts
@@ -2541,7 +2541,7 @@ describe("Maintenance", () => {
         const bridgeLog = tbtcContracts.bridge.redemptionProofLog
         expect(bridgeLog.length).to.equal(1)
         expect(bridgeLog[0].mainUtxo).to.equal(mainUtxo)
-        expect(bridgeLog[0].walletPublicKey).to.equal(
+        expect(bridgeLog[0].walletPublicKey).to.deep.equal(
           redemptionProof.expectedRedemptionProof.walletPublicKey
         )
         expect(bridgeLog[0].redemptionTx).to.deep.equal(

diff --git a/typescript/test/services/redemptions.test.ts b/typescript/test/services/redemptions.test.ts
@@ -376,8 +376,8 @@ describe("Redemptions", () => {
               >()
 
               const key = MockBridge.buildRedemptionKey(
-                walletPublicKeyHash.toString(),
-                redeemerOutputScript.toString()
+                walletPublicKeyHash,
+                redeemerOutputScript
               )
 
               pendingRedemptions.set(
@@ -465,13 +465,14 @@ describe("Redemptions", () => {
               >()
 
               const pendingRedemption1 = MockBridge.buildRedemptionKey(
-                walletPublicKeyHash.toString(),
-                redeemerOutputScript.toString()
+                walletPublicKeyHash,
+                redeemerOutputScript
               )
 
               const pendingRedemption2 = MockBridge.buildRedemptionKey(
-                findWalletForRedemptionData.liveWallet.event.walletPublicKeyHash.toString(),
-                redeemerOutputScript.toString()
+                findWalletForRedemptionData.liveWallet.event
+                  .walletPublicKeyHash,
+                redeemerOutputScript
               )
 
               pendingRedemptions.set(

diff --git a/typescript/test/utils/mock-bridge.ts b/typescript/test/utils/mock-bridge.ts
@@ -36,17 +36,17 @@ interface RevealDepositLogEntry {
 }
 
 interface RequestRedemptionLogEntry {
-  walletPublicKey: string
+  walletPublicKey: Hex
   mainUtxo: BitcoinUtxo
-  redeemerOutputScript: string
+  redeemerOutputScript: Hex
   amount: BigNumber
 }
 
 interface RedemptionProofLogEntry {
   redemptionTx: BitcoinRawTxVectors
   redemptionProof: BitcoinSpvProof
   mainUtxo: BitcoinUtxo
-  walletPublicKey: string
+  walletPublicKey: Hex
 }
 
 interface NewWalletRegisteredEventsLog {
@@ -55,7 +55,7 @@ interface NewWalletRegisteredEventsLog {
 }
 
 interface WalletLog {
-  walletPublicKeyHash: string
+  walletPublicKeyHash: Hex
 }
 
 /**
@@ -229,7 +229,7 @@ export class MockBridge implements Bridge {
       redemptionTx,
       redemptionProof,
       mainUtxo,
-      walletPublicKey: walletPublicKey.toString(),
+      walletPublicKey,
     })
     return new Promise<void>((resolve, _) => {
       resolve()
@@ -243,9 +243,9 @@ export class MockBridge implements Bridge {
     amount: BigNumber
   ) {
     this._requestRedemptionLog.push({
-      walletPublicKey: walletPublicKey.toString(),
+      walletPublicKey,
       mainUtxo,
-      redeemerOutputScript: redeemerOutputScript.toString(),
+      redeemerOutputScript,
       amount,
     })
     return new Promise<void>((resolve, _) => {
@@ -266,8 +266,8 @@ export class MockBridge implements Bridge {
     return new Promise<RedemptionRequest>((resolve, _) => {
       resolve(
         this.redemptions(
-          walletPublicKey.toString(),
-          redeemerOutputScript.toString(),
+          walletPublicKey,
+          redeemerOutputScript,
           this._pendingRedemptions
         )
       )
@@ -281,21 +281,21 @@ export class MockBridge implements Bridge {
     return new Promise<RedemptionRequest>((resolve, _) => {
       resolve(
         this.redemptions(
-          walletPublicKey.toString(),
-          redeemerOutputScript.toString(),
+          walletPublicKey,
+          redeemerOutputScript,
           this._timedOutRedemptions
         )
       )
     })
   }
 
   private redemptions(
-    walletPublicKey: string,
-    redeemerOutputScript: string,
+    walletPublicKey: Hex,
+    redeemerOutputScript: Hex,
     redemptionsMap: Map<BigNumberish, RedemptionRequest>
   ): RedemptionRequest {
     const redemptionKey = MockBridge.buildRedemptionKey(
-      BitcoinHashUtils.computeHash160(Hex.from(walletPublicKey)).toString(),
+      BitcoinHashUtils.computeHash160(walletPublicKey),
       redeemerOutputScript
     )
 
@@ -314,12 +314,12 @@ export class MockBridge implements Bridge {
   }
 
   static buildRedemptionKey(
-    walletPublicKeyHash: string,
-    redeemerOutputScript: string
+    walletPublicKeyHash: Hex,
+    redeemerOutputScript: Hex
   ): string {
-    const prefixedWalletPublicKeyHash = `0x${walletPublicKeyHash}`
+    const prefixedWalletPublicKeyHash = walletPublicKeyHash.toPrefixedString()
 
-    const rawOutputScript = Buffer.from(redeemerOutputScript, "hex")
+    const rawOutputScript = redeemerOutputScript.toBuffer()
 
     const prefixedOutputScript = `0x${Buffer.concat([
       Buffer.from([rawOutputScript.length]),
@@ -353,7 +353,7 @@ export class MockBridge implements Bridge {
 
   async wallets(walletPublicKeyHash: Hex): Promise<Wallet> {
     this._walletsLog.push({
-      walletPublicKeyHash: walletPublicKeyHash.toPrefixedString(),
+      walletPublicKeyHash,
     })
     const wallet = this._wallets.get(walletPublicKeyHash.toPrefixedString())
     return wallet!