storage-node-v2: Apply merged-PR fixes

storage-node-v2/src/services/helpers/bagTypes.ts

@@ -1,8 +1,6 @@
 import { BagId, DynamicBagType, DynamicBagTypeKey, Static, Dynamic } from '@joystream/types/storage'
 import { WorkingGroup } from '@joystream/types/common'
-import { registry } from '@joystream/types'
-import { createType } from '@polkadot/types'
-import { InterfaceTypes } from '@polkadot/types/types'
+import { createType } from '@joystream/types'
 import ExitCodes from '../../command-base/ExitCodes'
 import { CLIError } from '@oclif/errors'
 
@@ -29,7 +27,7 @@ export class BagIdValidationError extends CLIError {
  * @returns The DynamicBagType instance.
  */
 export function parseDynamicBagType(bagType: DynamicBagTypeKey): DynamicBagType {
-  return createJoystreamType('DynamicBagType', bagType)
+  return createType('DynamicBagType', bagType)
 }
 
 /**
@@ -89,8 +87,8 @@ class BagIdParser {
     // Try to construct static council bag ID.
     if (this.bagIdParts[1] === 'council') {
       if (this.bagIdParts.length === 2) {
-        const staticBagId: Static = createJoystreamType('Static', 'Council')
-        const constructedBagId: BagId = createJoystreamType('BagId', {
+        const staticBagId: Static = createType('Static', 'Council')
+        const constructedBagId: BagId = createType('BagId', {
           'Static': staticBagId,
         })
 
@@ -106,11 +104,11 @@ class BagIdParser {
 
         for (const group of groups) {
           if (group.toLowerCase() === actualGroup) {
-            const workingGroup: WorkingGroup = createJoystreamType('WorkingGroup', group)
-            const staticBagId: Static = createJoystreamType('Static', {
+            const workingGroup: WorkingGroup = createType('WorkingGroup', group)
+            const staticBagId: Static = createType('Static', {
               'WorkingGroup': workingGroup,
             })
-            const constructedBagId: BagId = createJoystreamType('BagId', {
+            const constructedBagId: BagId = createType('BagId', {
               'Static': staticBagId,
             })
 
@@ -142,8 +140,8 @@ class BagIdParser {
             const dynamic = {} as Record<DynamicBagTypeKey, number>
             dynamic[dynamicBagType as DynamicBagTypeKey] = parsedId
 
-            const dynamicBagId: Dynamic = createJoystreamType('Dynamic', dynamic)
-            const constructedBagId: BagId = createJoystreamType('BagId', {
+            const dynamicBagId: Dynamic = createType('Dynamic', dynamic)
+            const constructedBagId: BagId = createType('BagId', {
               'Dynamic': dynamicBagId,
             })
 
@@ -156,10 +154,3 @@ class BagIdParser {
     throw new BagIdValidationError(`Invalid dynamic bagId: ${this.bagId}`)
   }
 }
-
-/**
- * Creates Joystream type using type registry.
- */
-function createJoystreamType<T extends keyof InterfaceTypes>(type: T, value: unknown): InterfaceTypes[T] {
-  return createType(registry, type, value)
-}

storage-node-v2/src/services/queryNode/api.ts

@@ -54,7 +54,7 @@ export class QueryNodeApi {
       link: new HttpLink({ uri: endpoint, fetch }),
       cache: new InMemoryCache(),
       defaultOptions: {
-        query: { fetchPolicy: 'no-cache', errorPolicy: 'all' },
+        query: { fetchPolicy: 'no-cache', errorPolicy: 'none' },
       },
     })
   }

storage-node-v2/src/services/queryNode/generated/queries.ts

@@ -44,10 +44,10 @@ export type GetStorageBucketDetailsQueryVariables = Types.Exact<{
 
 export type GetStorageBucketDetailsQuery = { storageBuckets: Array<StorageBucketDetailsFragment> }
 
-export type StorageBagDetailsFragment = { id: string; storageAssignments: Array<{ storageBucket: { id: string } }> }
+export type StorageBagDetailsFragment = { id: string; storageBuckets: Array<{ id: string }> }
 
 export type GetStorageBagDetailsQueryVariables = Types.Exact<{
-  bucketIds?: Types.Maybe<Array<Types.Scalars['String']> | Types.Scalars['String']>
+  bucketIds?: Types.Maybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>
   offset?: Types.Maybe<Types.Scalars['Int']>
   limit?: Types.Maybe<Types.Scalars['Int']>
 }>
@@ -55,7 +55,7 @@ export type GetStorageBagDetailsQueryVariables = Types.Exact<{
 export type GetStorageBagDetailsQuery = { storageBags: Array<StorageBagDetailsFragment> }
 
 export type GetBagConnectionQueryVariables = Types.Exact<{
-  bucketIds?: Types.Maybe<Array<Types.Scalars['String']> | Types.Scalars['String']>
+  bucketIds?: Types.Maybe<Array<Types.Scalars['ID']> | Types.Scalars['ID']>
   limit?: Types.Maybe<Types.Scalars['Int']>
   cursor?: Types.Maybe<Types.Scalars['String']>
 }>
@@ -109,10 +109,8 @@ export const StorageBucketDetails = gql`
 export const StorageBagDetails = gql`
   fragment StorageBagDetails on StorageBag {
     id
-    storageAssignments {
-      storageBucket {
-        id
-      }
+    storageBuckets {
+      id
     }
   }
 `
@@ -171,24 +169,16 @@ export const GetStorageBucketDetails = gql`
   ${StorageBucketDetails}
 `
 export const GetStorageBagDetails = gql`
-  query getStorageBagDetails($bucketIds: [String!], $offset: Int, $limit: Int) {
-    storageBags(
-      offset: $offset
-      limit: $limit
-      where: { storageAssignments_some: { storageBucketId_in: $bucketIds } }
-    ) {
+  query getStorageBagDetails($bucketIds: [ID!], $offset: Int, $limit: Int) {
+    storageBags(offset: $offset, limit: $limit, where: { storageBuckets_some: { id_in: $bucketIds } }) {
       ...StorageBagDetails
     }
   }
   ${StorageBagDetails}
 `
 export const GetBagConnection = gql`
-  query getBagConnection($bucketIds: [String!], $limit: Int, $cursor: String) {
-    storageBagsConnection(
-      first: $limit
-      after: $cursor
-      where: { storageAssignments_some: { storageBucketId_in: $bucketIds } }
-    ) {
+  query getBagConnection($bucketIds: [ID!], $limit: Int, $cursor: String) {
+    storageBagsConnection(first: $limit, after: $cursor, where: { storageBuckets_some: { id_in: $bucketIds } }) {
       edges {
         cursor
         node {

storage-node-v2/src/services/queryNode/queries/queries.graphql

@@ -63,25 +63,19 @@ query getStorageBucketDetails($ids: [ID!], $offset: Int, $limit: Int) {
 
 fragment StorageBagDetails on StorageBag {
   id
-  storageAssignments {
-    storageBucket {
-      id
-    }
+  storageBuckets {
+    id
   }
 }
 
-query getStorageBagDetails($bucketIds: [String!], $offset: Int, $limit: Int) {
-  storageBags(offset: $offset, limit: $limit, where: { storageAssignments_some: { storageBucketId_in: $bucketIds } }) {
+query getStorageBagDetails($bucketIds: [ID!], $offset: Int, $limit: Int) {
+  storageBags(offset: $offset, limit: $limit, where: { storageBuckets_some: { id_in: $bucketIds } }) {
     ...StorageBagDetails
   }
 }
 
-query getBagConnection($bucketIds: [String!], $limit: Int, $cursor: String) {
-  storageBagsConnection(
-    first: $limit
-    after: $cursor
-    where: { storageAssignments_some: { storageBucketId_in: $bucketIds } }
-  ) {
+query getBagConnection($bucketIds: [ID!], $limit: Int, $cursor: String) {
+  storageBagsConnection(first: $limit, after: $cursor, where: { storageBuckets_some: { id_in: $bucketIds } }) {
     edges {
       cursor
       node {

storage-node-v2/src/services/sync/storageObligations.ts

@@ -108,7 +108,7 @@ export async function getStorageObligationsFromRuntime(
     })),
     bags: assignedBags.map((bag) => ({
       id: bag.id,
-      buckets: bag.storageAssignments.map((bucketInBag) => bucketInBag.storageBucket.id),
+      buckets: bag.storageBuckets.map((bucketInBag) => bucketInBag.id),
     })),
     dataObjects: assignedDataObjects.map((dataObject) => ({
       id: dataObject.id,