Remove distinction between "giza" and "sumer" mappings

query-node/mappings/sumer/content/channel.ts → query-node/mappings/content/channel.ts

@@ -4,10 +4,10 @@ eslint-disable @typescript-eslint/naming-convention
 import { EventContext, StoreContext } from '@joystream/hydra-common'
 import { AccountId } from '@polkadot/types/interfaces'
 import { Option } from '@polkadot/types/codec'
-import { Content } from '../../generated/types'
+import { Content } from '../generated/types'
 import { convertContentActorToChannelOwner, processChannelMetadata } from './utils'
 import { AssetNone, Channel, ChannelCategory } from 'query-node/dist/model'
-import { deserializeMetadata, inconsistentState, logger } from '../../common'
+import { deserializeMetadata, inconsistentState, logger } from '../common'
 import { ChannelCategoryMetadata, ChannelMetadata } from '@joystream/metadata-protobuf'
 import { integrateMeta } from '@joystream/metadata-protobuf/utils'
 

query-node/mappings/sumer/content/curatorGroup.ts → query-node/mappings/content/curatorGroup.ts

@@ -4,8 +4,8 @@ eslint-disable @typescript-eslint/naming-convention
 import { EventContext, StoreContext } from '@joystream/hydra-common'
 import { FindConditions } from 'typeorm'
 import { CuratorGroup } from 'query-node/dist/model'
-import { Content } from '../../generated/types'
-import { inconsistentState, logger } from '../../common'
+import { Content } from '../generated/types'
+import { inconsistentState, logger } from '../common'
 
 export async function content_CuratorGroupCreated({ store, event }: EventContext & StoreContext): Promise<void> {
   // read event data

query-node/mappings/sumer/content/utils.ts → query-node/mappings/content/utils.ts

@@ -8,7 +8,7 @@ import {
   IChannelMetadata,
 } from '@joystream/metadata-protobuf'
 import { integrateMeta, isSet, isValidLanguageCode } from '@joystream/metadata-protobuf/utils'
-import { invalidMetadata, inconsistentState, logger } from '../../common'
+import { invalidMetadata, inconsistentState, logger } from '../common'
 import {
   // primary entities
   CuratorGroup,

query-node/mappings/sumer/content/video.ts → query-node/mappings/content/video.ts

@@ -3,8 +3,8 @@ eslint-disable @typescript-eslint/naming-convention
 */
 import { EventContext, StoreContext } from '@joystream/hydra-common'
 import { In } from 'typeorm'
-import { Content } from '../../generated/types'
-import { deserializeMetadata, inconsistentState, logger } from '../../common'
+import { Content } from '../generated/types'
+import { deserializeMetadata, inconsistentState, logger } from '../common'
 import { processVideoMetadata } from './utils'
 import { Channel, Video, VideoCategory, AssetNone } from 'query-node/dist/model'
 import { VideoMetadata, VideoCategoryMetadata } from '@joystream/metadata-protobuf'

query-node/mappings/giza/index.ts

@@ -1,2 +0,0 @@
-export * from './genesis'
-export * from './storage'

query-node/mappings/index.ts

@@ -1,2 +1,5 @@
-export * from './giza'
-export * from './sumer'
+export * from './membership'
+export * from './workingGroup'
+export * from './content'
+export * from './storage'
+export * from './genesis'

query-node/mappings/sumer/membership.ts → query-node/mappings/membership.ts

@@ -2,8 +2,8 @@ import { Bytes } from '@polkadot/types'
 import { MemberId } from '@joystream/types/members'
 import { SubstrateEvent, EventContext, StoreContext } from '@joystream/hydra-common'
 
-import { bytesToString, inconsistentState, logger, extractExtrinsicArgs, extractSudoCallParameters } from '../common'
-import { Members } from '../generated/types'
+import { bytesToString, inconsistentState, logger, extractExtrinsicArgs, extractSudoCallParameters } from './common'
+import { Members } from './generated/types'
 import { MembershipEntryMethod, Membership } from 'query-node/dist/model'
 import { EntryMethod } from '@joystream/types/augment'
 

query-node/mappings/giza/storage/index.ts → query-node/mappings/storage/index.ts

@@ -2,7 +2,7 @@
 eslint-disable @typescript-eslint/naming-convention
 */
 import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
-import { Storage } from '../../generated/types/storage'
+import { Storage } from '../generated/types/storage'
 import {
   DistributionBucket,
   DistributionBucketFamily,
@@ -27,7 +27,7 @@ import {
   StorageBagStorageAssignment,
 } from 'query-node/dist/model'
 import BN from 'bn.js'
-import { getById, bytesToString } from '../../common'
+import { getById, bytesToString } from '../common'
 import { BTreeSet } from '@polkadot/types'
 import { DataObjectCreationParameters } from '@joystream/types/storage'
 import { registry } from '@joystream/types'

query-node/mappings/giza/storage/metadata.ts → query-node/mappings/storage/metadata.ts

@@ -6,7 +6,7 @@ import {
   GeoCoordinates,
   NodeLocationMetadata,
 } from 'query-node/dist/model'
-import { deserializeMetadata } from '../../common'
+import { deserializeMetadata } from '../common'
 import { Bytes } from '@polkadot/types'
 import {
   DistributionBucketOperatorMetadata as DistributionBucketOperatorMetadataProto,

query-node/mappings/sumer/index.ts

@@ -1,3 +0,0 @@
-export * from './content'
-export * from './membership'
-export * from './workingGroup'

query-node/mappings/sumer/workingGroup.ts → query-node/mappings/workingGroup.ts

@@ -1,7 +1,7 @@
 import { EventContext, StoreContext, DatabaseManager, SubstrateEvent } from '@joystream/hydra-common'
-import { bytesToString, inconsistentState, logger } from '../common'
+import { bytesToString, inconsistentState, logger } from './common'
 import { Worker, WorkerType } from 'query-node/dist/model'
-import { StorageWorkingGroup } from '../generated/types'
+import { StorageWorkingGroup } from './generated/types'
 import { WorkerId } from '@joystream/types/augment'
 
 export async function workingGroup_OpeningFilled({ event, store }: EventContext & StoreContext): Promise<void> {