Consolidate fetching logic

AugurProject · Nov 3, 2020 · 7a433ef · 7a433ef
1 parent dff20fd
commit 7a433ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/packages/augur-sdk/src/warp/WarpController.ts b/packages/augur-sdk/src/warp/WarpController.ts
@@ -303,13 +303,8 @@ export class WarpController {
       let fileResult;
       switch (this.ipfsEndpointInfo.version) {
         case IPFSHashVersion.CIDv0:
-          fileResult = await fetch(`${this.ipfsEndpointInfo.url}/ipfs/${ipfsHash}${ipfsPath}`)
-          .then(item => item.arrayBuffer())
-          .then(item => new Uint8Array(item))
-          break;
         case IPFSHashVersion.CIDv1:
-          const base32Hash = CIDTool.base32(ipfsHash)
-          fileResult = await fetch(`https://cloudflare-ipfs.com/ipfs/${base32Hash}${ipfsPath}`)
+          fileResult = await fetch(`${this.ipfsEndpointInfo.url}/${ipfsHash}${ipfsPath}`)
           .then(item => item.arrayBuffer())
           .then(item => new Uint8Array(item))
           break;

diff --git a/packages/augur-utils/src/extract-ipfs-url.ts b/packages/augur-utils/src/extract-ipfs-url.ts
@@ -28,7 +28,7 @@ export function extractIPFSUrl(urlString: string): IPFSEndpointInfo {
     const matches = cidV1Pattern.exec(url.hostname);
     return {
       version: IPFSHashVersion.CIDv1,
-      url: `.ipfs.${matches[1]}`
+      url: `${url.protocol}//${matches[1]}/ipfs`
     }
   }