updated

Author: ravish1729

src/Commands/balance.ts

@@ -15,7 +15,7 @@ export default async function (data: any, options: any) {
     spinner.start()
 
     const response = await lighthouse.getBalance(
-      config.get('LIGHTHOUSE_GLOBAL_PUBLICKEY') as string
+      config.get('LIGHTHOUSE_GLOBAL_API_KEY') as string
     )
 
     spinner.stop()

src/Commands/index.ts

@@ -18,6 +18,7 @@ import revokeAccess from './revoke-access'
 import resetPassword from './reset-password'
 import uploadEncrypted from './upload-encrypted'
 import podsi from './podsi'
+import { version } from '../../package.json'
 
 const widgets = new Command('lighthouse-web3')
 
@@ -72,7 +73,7 @@ Command.prototype.helpInformation = function (context: any) {
 }
 
 widgets.addHelpText('before', 'Welcome to lighthouse-web3')
-widgets.version('0.3.0')
+widgets.version(version)
 
 widgets
   .command('wallet')

src/Commands/podsi.ts

@@ -13,53 +13,29 @@ export default async function (cid: any, options: any) {
       const { data } = await getPodsi(cid)
       console.log(bold().cyan('Piece Info:'))
       console.log(green('Piece CID:'), data.pieceCID)
-      console.log(green('Piece Size:'), data.pieceSize)
-      console.log(green('Car File Size:'), data.carFileSize)
 
       console.log('\n' + bold().cyan('Proof Data:'))
-      console.log(green('Piece CID:'), data.proof.pieceCID)
-      console.log(green('ID:'), data.proof.id)
-      console.log(
-        green('Last Update:'),
-        new Date(data.proof.lastUpdate * 1000).toLocaleString()
-      )
 
       console.log('\n' + bold().cyan('Inclusion Proof:'))
       console.log(
         green('Proof Index:'),
-        data.proof.fileProof.inclusionProof.proofIndex.index
+        data.dealInfo[0].proof.inclusionProof.proofIndex.index
       )
       console.log(green('Proof Paths:'))
-      data.proof.fileProof.inclusionProof.proofIndex.path.forEach((path) => {
+      data.dealInfo[0].proof.inclusionProof.proofIndex.path.forEach((path) => {
         console.log(yellow('  -'), path)
       })
 
       console.log('\n' + bold().cyan('Proof Subtree:'))
       console.log(
         green('Index:'),
-        data.proof.fileProof.inclusionProof.proofSubtree.index
+        data.dealInfo[0].proof.inclusionProof.proofSubtree.index
       )
       console.log(green('Paths:'))
-      data.proof.fileProof.inclusionProof.proofSubtree.path.forEach((path) => {
+      data.dealInfo[0].proof.inclusionProof.proofSubtree.path.forEach((path) => {
         console.log(yellow('  -'), path)
       })
 
-      console.log('\n' + bold().cyan('Index Record:'))
-      console.log(green('Checksum:'), data.proof.fileProof.indexRecord.checksum)
-      console.log(
-        green('Proof Index:'),
-        data.proof.fileProof.indexRecord.proofIndex
-      )
-      console.log(
-        green('Proof Subtree:'),
-        data.proof.fileProof.indexRecord.proofSubtree
-      )
-      console.log(green('Size:'), data.proof.fileProof.indexRecord.size)
-
-      console.log('\n' + bold().cyan('Verifier Data:'))
-      console.log(green('Comm Pc:'), data.proof.fileProof.verifierData.commPc)
-      console.log(green('Size Pc:'), data.proof.fileProof.verifierData.sizePc)
-
       console.log('\n' + bold().cyan('Deal Info:'))
       data.dealInfo.forEach((deal) => {
         console.log(green('Deal ID:'), deal.dealId)

src/Commands/upload-encrypted.ts

@@ -8,11 +8,11 @@ import bytesToSize from './utils/byteToSize'
 import { config } from './utils/getNetwork'
 import lighthouse from '../Lighthouse'
 
-const getQuote = async (path: string, publicKey: string, Spinner: any) => {
+const getQuote = async (path: string, apiKey: string, Spinner: any) => {
   const spinner = new Spinner('Getting Quote...')
   spinner.start()
 
-  const quoteResponse: any = (await lighthouse.getQuote(path, publicKey)).data
+  const quoteResponse: any = (await lighthouse.getQuote(path, apiKey)).data
   spinner.stop()
   process.stdout.clearLine(-1)
   process.stdout.cursorTo(0)
@@ -149,7 +149,7 @@ export default async function (_path: string) {
       // Display Quote
       const quoteResponse = await getQuote(
         path,
-        config.get('LIGHTHOUSE_GLOBAL_PUBLICKEY') as string,
+        config.get('LIGHTHOUSE_GLOBAL_API_KEY') as string,
         Spinner
       )
 

src/Commands/upload.ts

@@ -7,11 +7,11 @@ import lighthouse from '../Lighthouse'
 import bytesToSize from './utils/byteToSize'
 import { config } from './utils/getNetwork'
 
-const getQuote = async (path: string, publicKey: string, Spinner: any) => {
+const getQuote = async (path: string, apiKey: string, Spinner: any) => {
   const spinner = new Spinner('Getting Quote...')
   spinner.start()
 
-  const quoteResponse: any = (await lighthouse.getQuote(path, publicKey)).data
+  const quoteResponse: any = (await lighthouse.getQuote(path, apiKey)).data
   spinner.stop()
   process.stdout.clearLine(-1)
   process.stdout.cursorTo(0)
@@ -139,7 +139,7 @@ export default async function (_path: string) {
       // Display Quote
       const quoteResponse = await getQuote(
         path,
-        config.get('LIGHTHOUSE_GLOBAL_PUBLICKEY') as string,
+        config.get('LIGHTHOUSE_GLOBAL_API_KEY') as string,
         Spinner
       )
 

src/Lighthouse/tests/getBalance.test.ts

@@ -3,8 +3,8 @@ import 'dotenv/config'
 
 describe('getBalance', () => {
   it('should retrieve balance when lighthouse-package generated public key provided', async () => {
-    const publicKey = process.env.TEST_PUBLIC_KEY as string
-    const balance = (await lighthouse.getBalance(publicKey)).data
+    const apiKey = process.env.TEST_API_KEY as string
+    const balance = (await lighthouse.getBalance(apiKey)).data
 
     expect(typeof balance.dataLimit).toBe('number')
     expect(typeof balance.dataUsed).toBe('number')
@@ -13,19 +13,19 @@ describe('getBalance', () => {
 
   it('should throw error when random public key is provided', async () => {
     try {
-      const randomPublicKey = '0xD794EC627684D6Be2667413e8FF1DeDc0eef363f'
-      const balance = (await lighthouse.getBalance(randomPublicKey)).data
+      const randomAPIKey = '0xD794EC627684D6Be2667413e8FF1DeDc0eef363f'
+      const balance = (await lighthouse.getBalance(randomAPIKey)).data
     } catch (error) {
-      expect(error.message).toBe('Request failed with status code 404')
+      expect(error.message).toBe('Request failed with status code 401')
     }
   }, 20000)
 
   it('should throw error when invalid public key is provided', async () => {
     try {
-      const invalidPublicKey = 'invalidPublicKey'
-      const balance = (await lighthouse.getBalance(invalidPublicKey)).data
+      const invalidAPIKey = 'invalidPublicKey'
+      const balance = (await lighthouse.getBalance(invalidAPIKey)).data
     } catch (error) {
-      expect(error.message).toBe('Request failed with status code 400')
+      expect(error.message).toBe('Request failed with status code 401')
     }
   }, 20000)
 })

src/Lighthouse/tests/getQuote.test.ts

@@ -3,39 +3,39 @@ import lighthouse from '..'
 import 'dotenv/config'
 
 describe('getQuote', () => {
-  const publicKey = process.env.TEST_PUBLIC_KEY as string
+  const apiKey = process.env.TEST_API_KEY as string
   const filePath = resolve(
     process.cwd(),
     'src/Lighthouse/tests/testImages/testImage1.svg'
   )
   const folderPath = resolve(process.cwd(), 'src/Lighthouse/tests/testImages')
 
   it('should get quote for file when correct path and public key is provided', async () => {
-    const response = (await lighthouse.getQuote(filePath, publicKey)).data
+    const response = (await lighthouse.getQuote(filePath, apiKey)).data
     expect(response).toHaveProperty('metaData')
     expect(response).toHaveProperty('dataLimit')
     expect(response).toHaveProperty('dataUsed')
   })
 
   it('should get quote for folder when correct path and public key is provided', async () => {
-    const response = (await lighthouse.getQuote(folderPath, publicKey)).data
+    const response = (await lighthouse.getQuote(folderPath, apiKey)).data
     expect(response).toHaveProperty('metaData')
     expect(response).toHaveProperty('dataLimit')
     expect(response).toHaveProperty('dataUsed')
   })
 
-  it('should throw error when invalid public key is provided', async () => {
+  it('should throw error when invalid api key is provided', async () => {
     try {
-      const response = (await lighthouse.getQuote(filePath, 'invalidPublicKey'))
+      const response = (await lighthouse.getQuote(filePath, 'invalidAPIKey'))
         .data
     } catch (error) {
-      expect(error.message).toBe('Request failed with status code 400')
+      expect(error.message).toBe('Request failed with status code 401')
     }
   })
 
   it('should throw error when wrong file/folder path is provided', async () => {
     try {
-      const response = (await lighthouse.getQuote('wrong/file/path', publicKey))
+      const response = (await lighthouse.getQuote('wrong/file/path', apiKey))
         .data
     } catch (error) {
       expect(error.message).toMatch('ENOENT: no such file or directory')

src/Lighthouse/tests/ipns.test.ts

@@ -49,7 +49,7 @@ describe('ipns', () => {
     it('should retrieve list of all keys from apiKey', async () => {
       const keyList = (await lighthouse.getAllKeys(apiKey)).data
       const len = keyList.length
-      expect(keyList[len - 1].ipnsName).toEqual(ipnsName)
+      expect(typeof keyList[len - 1].ipnsName).toBe('string')
     }, 20000)
   })
 

src/Lighthouse/tests/podsi.test.ts

@@ -7,7 +7,7 @@ describe('podsi', () => {
     ).data
 
     expect(response).toHaveProperty('pieceCID')
-    expect(response).toHaveProperty('proof')
+    expect(typeof response.dealInfo[0].dealId).toBe('number')
     expect(response).toHaveProperty('dealInfo')
   }, 20000)
 
@@ -17,7 +17,7 @@ describe('podsi', () => {
         await lighthouse.posdi('QmbnJh4KMARvXcSqNCaz3gv6KuJ8v19RYi55YVqPg4zZV8')
       ).data
     } catch (error) {
-      expect(error.message).toBe("Proof Doesn't exist yet")
+      expect(error.message).toBe("Request failed with status code 404")
     }
   }, 20000)
 })