fix tests

glamsystems · Oct 3, 2024 · 5ed20d2 · 5ed20d2
1 parent f51ee51
commit 5ed20d2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/anchor/src/client/base.ts b/anchor/src/client/base.ts
@@ -776,6 +776,7 @@ export class BaseClient {
       treasuryId: fundAccount.treasury.toBase58(),
       openfundsMetadataId: fundAccount.openfunds.toBase58(),
       fundUri: `https://playground.glam.systems/products/${fundPDA}`,
+      //@ts-ignore
       imageKey: (fundModel.shareClasses[0]?.id || fundPDA).toBase58(),
       ...this.getOpenfundsFromAccounts(fundAccount, openfundsAccount, [
         firstShareClass,

diff --git a/anchor/src/client/drift.ts b/anchor/src/client/drift.ts
@@ -371,6 +371,7 @@ export class DriftClient {
     const state = await getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
 
     const tx = await this.base.program.methods
+      //@ts-ignore
       .driftPlaceOrders(orderParams)
       .accounts({
         fund,
@@ -402,6 +403,7 @@ export class DriftClient {
     const state = await getDriftStateAccountPublicKey(this.DRIFT_PROGRAM);
 
     const tx = await this.base.program.methods
+      //@ts-ignore
       .driftCancelOrders(marketType, marketIndex, direction)
       .accounts({
         fund,

diff --git a/anchor/src/models.ts b/anchor/src/models.ts
@@ -36,7 +36,7 @@ export const FundModel = class<FundModel> {
         : null,
       manager: obj.fundManagers
         ? (new ManagerModel(obj.fundManagers[0]) as ManagerModel)
-        : null,
+        : obj?.manager || null,
       rawOpenfunds: new FundOpenfundsModel(obj) as FundOpenfundsModel,
     };
     Object.keys(result).forEach((key) => {

diff --git a/anchor/target/idl/glam.json b/anchor/target/idl/glam.json
@@ -1,5 +1,5 @@
 {
-  "address": "GLAMpLuXu78TA4ao3DPZvT1zQ7woxoQ8ahdYbhnqY9mP",
+  "address": "Gco1pcjxCMYjKJjSNJ7mKV7qezeUTE7arXJgy7PAPNRc",
   "metadata": {
     "name": "glam",
     "version": "0.3.1",

diff --git a/anchor/tests/glam_crud.spec.ts b/anchor/tests/glam_crud.spec.ts
@@ -25,8 +25,10 @@ describe("glam_crud", () => {
 
     const fund = await glamClient.fetchFund(fundPDA);
     expect(fund.shareClasses.length).toEqual(1);
-    expect(fund.shareClasses[0].allowlist).toEqual([glamClient.getManager()]);
-    expect(fund.shareClasses[0].blocklist).toEqual([]);
+    expect(fund.shareClasses[0].shareClassAllowlist).toEqual([
+      glamClient.getManager(),
+    ]);
+    expect(fund.shareClasses[0].shareClassBlocklist).toEqual([]);
   });
 
   it("Update fund name", async () => {