referenda storage fix

rajdeep7Singh · Apr 20, 2023 · d1c9860 · d1c9860
1 parent 47e0192
commit d1c9860
Showing 1 changed file with 54 additions and 53 deletions.
diff --git a/src/mappings/referendumV2/events/referendaSubmitted.ts b/src/mappings/referendumV2/events/referendaSubmitted.ts
@@ -28,62 +28,63 @@ interface ReferendumInfo {
 export async function getStorageData(ctx: BatchContext<Store, unknown>, index: number, block: SubstrateBlock): Promise<ReferendumInfo | undefined> {
     const storage = new ReferendaReferendumInfoForStorage(ctx, block)
 
-    if(storage.isV2100){
-        const storageData = await storage.asV2100.get(index)
-        if (!storageData) return undefined
-        if(storageData.__kind === 'Ongoing') {
-            let enactmentAt = undefined
-            let enactmentAfter = undefined;
-            if(storageData.value.enactment.__kind === 'At') {
-                enactmentAt = storageData.value.enactment.value
-            }
-            else if(storageData.value.enactment.__kind === 'After') {
-                enactmentAfter = storageData.value.enactment.value
-            }
-            return {
-                index,
-                trackNumber: storageData.value.track,
-                origin: storageData.value.origin.value.__kind,
-                enactmentAt: enactmentAt,
-                enactmentAfter: enactmentAfter,
-                submittedAt: storageData.value.submitted,
-                submissionDeposit: storageData.value.submissionDeposit,
-                decisionDeposit: storageData.value.decisionDeposit,
-                deciding: storageData.value.deciding,
-                tally: storageData.value.tally
-            }
-        }
+    if (!storage.isExists) return undefined
+    const storageData = await ctx._chain.getStorage(block.hash, 'Referenda', 'ReferendumInfoFor', index)
 
-    }else if(storage.isV2201){
-        const storageData = await storage.asV2201.get(index)
-        if (!storageData) return undefined
-        if(storageData.__kind === 'Ongoing') {
-            let enactmentAt = undefined
-            let enactmentAfter = undefined;
-            if(storageData.value.enactment.__kind === 'At') {
-                enactmentAt = storageData.value.enactment.value
-            }
-            else if(storageData.value.enactment.__kind === 'After') {
-                enactmentAfter = storageData.value.enactment.value
-            }
-            return {
-                index,
-                trackNumber: storageData.value.track,
-                origin: storageData.value.origin.value.__kind,
-                enactmentAt: enactmentAt,
-                enactmentAfter: enactmentAfter,
-                submittedAt: storageData.value.submitted,
-                submissionDeposit: storageData.value.submissionDeposit,
-                decisionDeposit: storageData.value.decisionDeposit,
-                deciding: storageData.value.deciding,
-                tally: storageData.value.tally
-            }
+    if (!storageData) return undefined
+    if(storageData.__kind === 'Ongoing') {
+        let enactmentAt = undefined
+        let enactmentAfter = undefined;
+        if(storageData.value.enactment.__kind === 'At') {
+            enactmentAt = storageData.value.enactment.value
+        }
+        else if(storageData.value.enactment.__kind === 'After') {
+            enactmentAfter = storageData.value.enactment.value
+        }
+        return {
+            index,
+            trackNumber: storageData.value.track,
+            origin: storageData.value.origin.value.__kind,
+            enactmentAt: enactmentAt,
+            enactmentAfter: enactmentAfter,
+            submittedAt: storageData.value.submitted,
+            submissionDeposit: storageData.value.submissionDeposit,
+            decisionDeposit: storageData.value.decisionDeposit,
+            deciding: storageData.value.deciding,
+            tally: storageData.value.tally
         }
-
-    }
-    else {
-        throw new UnknownVersionError(storage.constructor.name)
     }
+
+    // }else if(storage.isV2201){
+    //     const storageData = await storage.asV2201.get(index)
+    //     if (!storageData) return undefined
+    //     if(storageData.__kind === 'Ongoing') {
+    //         let enactmentAt = undefined
+    //         let enactmentAfter = undefined;
+    //         if(storageData.value.enactment.__kind === 'At') {
+    //             enactmentAt = storageData.value.enactment.value
+    //         }
+    //         else if(storageData.value.enactment.__kind === 'After') {
+    //             enactmentAfter = storageData.value.enactment.value
+    //         }
+    //         return {
+    //             index,
+    //             trackNumber: storageData.value.track,
+    //             origin: storageData.value.origin.value.__kind,
+    //             enactmentAt: enactmentAt,
+    //             enactmentAfter: enactmentAfter,
+    //             submittedAt: storageData.value.submitted,
+    //             submissionDeposit: storageData.value.submissionDeposit,
+    //             decisionDeposit: storageData.value.decisionDeposit,
+    //             deciding: storageData.value.deciding,
+    //             tally: storageData.value.tally
+    //         }
+    //     }
+
+    // }
+    // else {
+    //     throw new UnknownVersionError(storage.constructor.name)
+    // }
 }