fix: merge conflicts

Akord-com · Nov 16, 2023 · 73fdf58 · 73fdf58
1 parent 7258ce4
commit 73fdf58
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/__tests__/nft.test.ts b/src/__tests__/nft.test.ts
@@ -59,9 +59,6 @@ describe("Testing NFT functions", () => {
     const { data } = await akord.nft.getAsset(nftId);
     expect(data).toEqual(await file.arrayBuffer());
 
-    const fileBuffer = await akord.file.get(nft.asset.getUri(StorageType.S3), nft.vaultId);
-    expect(fileBuffer).toEqual(await file.arrayBuffer());
-
     const assetUri = await akord.nft.getUri(nftId);
     expect(assetUri).toBeTruthy();
     expect(assetUri).toEqual(nft.asset.getUri(StorageType.ARWEAVE));

diff --git a/src/core/nft.ts b/src/core/nft.ts
@@ -1,6 +1,5 @@
 import { NodeService } from "./node";
-import { FileVersion, StorageType, nodeType } from "../types/node";
-import { StackCreateOptions } from "./stack";
+import { FileVersion, StackCreateOptions, StorageType, nodeType } from "../types";
 import { FileLike } from "../types/file";
 import { FileService } from "./file";
 import { NFT, NFTMetadata } from "../types/nft";
@@ -75,7 +74,7 @@ class NFTService extends NodeService<NFT> {
    */
   public async getAsset(nftId: string): Promise<FileVersion & { data: ArrayBuffer }> {
     const nft = new NFT(await this.api.getNode<NFT>(nftId, this.objectType));
-    const { fileData } = await this.api.downloadFile(nft.getUri(StorageType.S3), { public: true });
+    const { fileData } = await this.api.downloadFile(nft.getUri(StorageType.S3));
     return { data: fileData, ...nft.asset } as FileVersion & { data: ArrayBuffer };
   }
 

diff --git a/src/types/nft.ts b/src/types/nft.ts
@@ -1,5 +1,6 @@
 import { AssetMetadata } from "./asset";
-import { FileVersion, Node, StorageType } from "./node";
+import { Node, StorageType } from "./node";
+import { FileVersion } from "../types";
 
 export class NFT extends Node {
   ticker: string;