From 15ca3fce2073cafa87cdadc50cd5990bc65cdb06 Mon Sep 17 00:00:00 2001
From: Ben Guidarelli <ben.guidarelli@gmail.com>
Date: Wed, 3 Jan 2024 13:51:31 -0500
Subject: [PATCH] fix tests

---
 .../__tests__/integration/tokenBridge.test.ts  | 18 +++++++++---------
 platforms/solana/protocols/core/src/core.ts    |  2 --
 .../protocols/tokenBridge/src/tokenBridge.ts   |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/platforms/solana/__tests__/integration/tokenBridge.test.ts b/platforms/solana/__tests__/integration/tokenBridge.test.ts
index 2a6091a12..bc378ea34 100644
--- a/platforms/solana/__tests__/integration/tokenBridge.test.ts
+++ b/platforms/solana/__tests__/integration/tokenBridge.test.ts
@@ -204,7 +204,7 @@ describe('TokenBridge Tests', () => {
       expect(attestTx.chain).toEqual(chain);
 
       const { transaction } = attestTx;
-      expect(transaction.instructions).toHaveLength(2);
+      expect(transaction.transaction.instructions).toHaveLength(2);
     });
 
     test('Submit Attestation', async () => {
@@ -229,7 +229,7 @@ describe('TokenBridge Tests', () => {
       });
       const submitAttestation = tb.submitAttestation(vaa, sender);
 
-      const allTxns = [];
+      const allTxns: SolanaUnsignedTransaction<TNet>[] = [];
       for await (const atx of submitAttestation) {
         allTxns.push(atx);
       }
@@ -237,9 +237,9 @@ describe('TokenBridge Tests', () => {
 
       const [verifySig, postVaa, create] = allTxns;
       //
-      expect(verifySig.transaction.instructions).toHaveLength(2);
-      expect(postVaa.transaction.instructions).toHaveLength(1);
-      expect(create.transaction.instructions).toHaveLength(1);
+      expect(verifySig.transaction.transaction.instructions).toHaveLength(2);
+      expect(postVaa.transaction.transaction.instructions).toHaveLength(1);
+      expect(create.transaction.transaction.instructions).toHaveLength(1);
     });
   });
 
@@ -260,7 +260,7 @@ describe('TokenBridge Tests', () => {
           const xfer = tb.transfer(sender, recipient, token, amount, payload);
           expect(xfer).toBeTruthy();
 
-          const allTxns = [];
+          const allTxns: SolanaUnsignedTransaction<TNet>[] = [];
           for await (const tx of xfer) {
             allTxns.push(tx);
           }
@@ -271,7 +271,7 @@ describe('TokenBridge Tests', () => {
           expect(xferTx!.chain).toEqual(chain);
 
           const { transaction } = xferTx;
-          expect(transaction.instructions).toHaveLength(6);
+          expect(transaction.transaction.instructions).toHaveLength(6);
           // ...
         });
 
@@ -285,7 +285,7 @@ describe('TokenBridge Tests', () => {
           );
           expect(xfer).toBeTruthy();
 
-          const allTxns = [];
+          const allTxns: SolanaUnsignedTransaction<TNet>[] = [];
           for await (const tx of xfer) {
             allTxns.push(tx);
           }
@@ -296,7 +296,7 @@ describe('TokenBridge Tests', () => {
           expect(xferTx.chain).toEqual(chain);
 
           const { transaction } = xferTx;
-          expect(transaction.instructions).toHaveLength(2);
+          expect(transaction.transaction.instructions).toHaveLength(2);
         });
       });
     });
diff --git a/platforms/solana/protocols/core/src/core.ts b/platforms/solana/protocols/core/src/core.ts
index 50109ec65..822239d53 100644
--- a/platforms/solana/protocols/core/src/core.ts
+++ b/platforms/solana/protocols/core/src/core.ts
@@ -31,8 +31,6 @@ import {
 } from '@wormhole-foundation/connect-sdk';
 import { Wormhole as WormholeCoreContract } from './types';
 import {
-  BridgeData,
-  createBridgeFeeTransferInstruction,
   createPostMessageInstruction,
   createPostVaaInstruction,
   createReadOnlyWormholeProgramInterface,
diff --git a/platforms/solana/protocols/tokenBridge/src/tokenBridge.ts b/platforms/solana/protocols/tokenBridge/src/tokenBridge.ts
index 87c0cb906..82e90b02e 100644
--- a/platforms/solana/protocols/tokenBridge/src/tokenBridge.ts
+++ b/platforms/solana/protocols/tokenBridge/src/tokenBridge.ts
@@ -218,7 +218,7 @@ export class SolanaTokenBridge<N extends Network, C extends SolanaChains>
 
     const msgFee = await this.coreBridge.getMessageFee();
     const transferIx = coreUtils.createBridgeFeeTransferInstruction(
-      this.coreBridge.address,
+      this.coreBridge.coreBridge.programId,
       senderAddress,
       msgFee,
     );