ArrayBuffer back to Uint8Array, CI cleanup

boorad · May 16, 2024 · 9bb4964 · 9bb4964
1 parent b493a20
commit 9bb4964
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 26 deletions.
diff --git a/examples/react-native/__tests__/App.test.tsx b/examples/react-native/__tests__/App.test.tsx
diff --git a/examples/react-native/package.json b/examples/react-native/package.json
@@ -8,8 +8,7 @@
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "pods": "bundle install && bundle exec pod install --project-directory=ios/",
-    "start": "react-native start",
-    "test": "jest"
+    "start": "react-native start"
   },
   "dependencies": {
     "@fireproof/core": "workspace:^",

diff --git a/packages/encrypted-blockstore/src/encrypt-helpers.ts b/packages/encrypted-blockstore/src/encrypt-helpers.ts
@@ -128,13 +128,13 @@ function makeEncDec(crypto: any, randomBytes: (size: number) => Uint8Array) {
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
 const chunker = bf(30)
 
-function hexStringToArrayBuffer(hexString: string): ArrayBuffer {
+function hexStringToUint8Array(hexString: string): Uint8Array {
   const length = hexString.length
   const uint8Array = new Uint8Array(length / 2)
   for (let i = 0; i < length; i += 2) {
     uint8Array[i / 2] = parseInt(hexString.substring(i, i + 2), 16)
   }
-  return uint8Array.buffer
+  return uint8Array
 }
 
 export async function encryptedEncodeCarFile(
@@ -143,7 +143,7 @@ export async function encryptedEncodeCarFile(
   rootCid: AnyLink,
   t: CarMakeable
 ): Promise<AnyBlock> {
-  const encryptionKey = hexStringToArrayBuffer(key)
+  const encryptionKey = hexStringToUint8Array(key)
   const encryptedBlocks = new MemoryBlockstore()
   const cidsToEncrypt = [] as AnyLink[]
   for (const { cid } of t.entries()) {
@@ -184,7 +184,7 @@ async function decodeCarBlocks(
   get: (cid: any) => Promise<AnyBlock | undefined>,
   keyMaterial: string
 ): Promise<{ blocks: MemoryBlockstore; root: AnyLink }> {
-  const decryptionKeyUint8 = hexStringToArrayBuffer(keyMaterial)
+  const decryptionKeyUint8 = hexStringToUint8Array(keyMaterial)
   const decryptionKey = decryptionKeyUint8.slice(0, decryptionKeyUint8.byteLength)
 
   const decryptedBlocks = new MemoryBlockstore()

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -44,9 +44,7 @@
     "format:fix": "prettier . --write",
     "lint:check": "eslint . --ext .ts,.tsx",
     "lint:fix": "eslint . --ext .ts,.tsx --fix",
-    "start": "tsup -w",
-    "test": "vitest run",
-    "test:cov": "vitest run --coverage"
+    "start": "tsup -w"
   },
   "author": "J Chris Anderson",
   "license": "Apache-2.0 OR MIT",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -53,6 +53,7 @@
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
+    "@babel/runtime": "^7.20.0",
     "@testing-library/react": "^14.1.2",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml