Make BlobContent into enum (#2465)

## Motivation Right now we have `BlobContent` always as a blob of bytes, but it can have many forms. This causes us to have to serialize/deserialize into those forms back and forth in the code more than we have to. ## Proposal Encode the blob type into the `BlobContent`. Now `BlobId` and `BlobContent` will have the type encoded in them. They're supposed to be a 1:1 mapping to each other. This will avoid unecessary serialization/deserialization ## Test Plan CI
linera-io · Sep 26, 2024 · b6aaf55 · b6aaf55
1 parent b75b3ed
commit b6aaf55
Show file tree

Hide file tree

Showing 27 changed files with 342 additions and 410 deletions.
diff --git a/examples/non-fungible/README.md b/examples/non-fungible/README.md
@@ -93,13 +93,15 @@ Type each of these in the GraphiQL interface and substitute the env variables wi
     mutation {
         publishDataBlob(
           chainId: "$CHAIN_1",
-          blobContent: {
-            bytes: [1, 2, 3, 4]
-          }
+          bytes: [1, 2, 3, 4]
         )
     }
 ```
 
+```bash
+BLOB_HASH=$(echo "$QUERY_RESULT" | jq -r '.publishDataBlob')
+```
+
 - Navigate to `http://localhost:8080/chains/$CHAIN_1/applications/$APP_ID`.
 - To mint an NFT, run the mutation:
 
@@ -108,7 +110,7 @@ Type each of these in the GraphiQL interface and substitute the env variables wi
         mint(
             minter: "User:$OWNER_1",
             name: "nft1",
-            blobHash: "34a20da0fdd7e24ddbff60cb7f952b053b3f0e196e622d47c3a368f690f01326",
+            blobHash: "$BLOB_HASH",
         )
     }
 ```

diff --git a/examples/non-fungible/src/lib.rs b/examples/non-fungible/src/lib.rs
@@ -97,13 +97,15 @@ Type each of these in the GraphiQL interface and substitute the env variables wi
     mutation {
         publishDataBlob(
           chainId: "$CHAIN_1",
-          blobContent: {
-            bytes: [1, 2, 3, 4]
-          }
+          bytes: [1, 2, 3, 4]
         )
     }
 ```
 
+```bash
+BLOB_HASH=$(echo "$QUERY_RESULT" | jq -r '.publishDataBlob')
+```
+
 - Navigate to `http://localhost:8080/chains/$CHAIN_1/applications/$APP_ID`.
 - To mint an NFT, run the mutation:
 
@@ -112,7 +114,7 @@ Type each of these in the GraphiQL interface and substitute the env variables wi
         mint(
             minter: "User:$OWNER_1",
             name: "nft1",
-            blobHash: "34a20da0fdd7e24ddbff60cb7f952b053b3f0e196e622d47c3a368f690f01326",
+            blobHash: "$BLOB_HASH",
         )
     }
 ```

diff --git a/examples/non-fungible/web-frontend/src/App.js b/examples/non-fungible/web-frontend/src/App.js
@@ -43,8 +43,8 @@ const MINT_NFT = gql`
 `;
 
 const PUBLISH_DATA_BLOB = gql`
-  mutation PublishDataBlob($chainId: ChainId!, $blobContent: BlobContent!) {
-    publishDataBlob(chainId: $chainId, blobContent: $blobContent)
+  mutation PublishDataBlob($chainId: ChainId!, $bytes: [Int!]!) {
+    publishDataBlob(chainId: $chainId, bytes: $bytes)
   }
 `;
 
@@ -186,9 +186,7 @@ function App({ chainId, owner }) {
     publishDataBlob({
       variables: {
         chainId: chainId,
-        blobContent: {
-          bytes: Array.from(byteArrayFile),
-        },
+        bytes: Array.from(byteArrayFile),
       },
     }).then((r) => {
       if ('errors' in r) {
@@ -197,7 +195,7 @@ function App({ chainId, owner }) {
         );
       } else {
         console.log('Data Blob published: ' + JSON.stringify(r, null, 2));
-        const blobHash = r['data']['publishDataBlob']['hash'];
+        const blobHash = r['data']['publishDataBlob'];
         mintNft({
           variables: {
             minter: `User:${owner}`,
@@ -380,21 +378,21 @@ function App({ chainId, owner }) {
             dataSource={
               ownedNftsData
                 ? Object.entries(ownedNftsData.ownedNfts).map(
-                    ([token_id, nft]) => {
-                      const decoder = new TextDecoder();
-                      const deserializedImage = decoder.decode(
-                        new Uint8Array(nft.payload)
-                      );
-
-                      return {
-                        key: token_id,
-                        token_id: token_id,
-                        name: nft.name,
-                        minter: nft.minter,
-                        payload: deserializedImage,
-                      };
-                    }
-                  )
+                  ([token_id, nft]) => {
+                    const decoder = new TextDecoder();
+                    const deserializedImage = decoder.decode(
+                      new Uint8Array(nft.payload)
+                    );
+
+                    return {
+                      key: token_id,
+                      token_id: token_id,
+                      name: nft.name,
+                      minter: nft.minter,
+                      payload: deserializedImage,
+                    };
+                  }
+                )
                 : []
             }
           />