Clean up FetchState.make function

Author: DZakh

codegenerator/cli/templates/static/codegen/src/EventUtils.res

@@ -28,11 +28,6 @@ type eventIndex = {
   logIndex: int,
 }
 
-let eventIndexSchema = S.object(s => {
-  blockNumber: s.field("blockNumber", S.int),
-  logIndex: s.field("logIndex", S.int),
-})
-
 // takes blockNumber, logIndex and packs them into a number with
 //32 bits, 16 bits and 16 bits respectively
 let packEventIndex = (~blockNumber, ~logIndex) => {

codegenerator/cli/templates/static/codegen/src/eventFetching/FetchState.res

@@ -278,11 +278,6 @@ with a dynamicContractId
 */
 type id = Root | DynamicContract(dynamicContractId)
 
-let idSchema = S.union([
-  S.literal(Root),
-  S.schema(s => DynamicContract(s.matches(EventUtils.eventIndexSchema))),
-])
-
 /**
 Constructs id from a register
 */
@@ -774,26 +769,20 @@ let getEarliestEvent = (self: t) => {
   }
 }
 
-let makeInternal = (
-  ~registerType,
+/**
+Instantiates a fetch state with root register
+*/
+let make = (
   ~staticContracts,
   ~dynamicContractRegistrations: array<TablesStatic.DynamicContractRegistry.t>,
   ~startBlock,
+  ~endBlock,
   ~isFetchingAtHead,
-  ~logger,
+  ~logger as _,
 ): t => {
   let contractAddressMapping = ContractAddressingMap.make()
 
   staticContracts->Belt.Array.forEach(((contractName, address)) => {
-    Logging.childTrace(
-      logger,
-      {
-        "msg": "adding contract address",
-        "contractName": contractName,
-        "address": address,
-      },
-    )
-
     contractAddressMapping->ContractAddressingMap.addAddress(~name=contractName, ~address)
   })
 
@@ -816,7 +805,7 @@ let makeInternal = (
   })
 
   let baseRegister = {
-    registerType,
+    registerType: RootRegister({endBlock: endBlock}),
     latestFetchedBlock: {
       blockTimestamp: 0,
       // Here's a bug that startBlock: 1 won't work
@@ -835,11 +824,6 @@ let makeInternal = (
   }
 }
 
-/**
-Instantiates a fetch state with root register
-*/
-let makeRoot = (~endBlock) => makeInternal(~registerType=RootRegister({endBlock: endBlock}), ...)
-
 /**
 Calculates the cummulative queue sizes in all registers
 */

codegenerator/cli/templates/static/codegen/src/eventFetching/PartitionedFetchState.res

@@ -28,10 +28,11 @@ let make = (
   let partitions = []
 
   if numAddresses <= maxAddrInPartition {
-    let partition = FetchState.makeRoot(~endBlock)(
+    let partition = FetchState.make(
       ~staticContracts,
       ~dynamicContractRegistrations,
       ~startBlock,
+      ~endBlock,
       ~logger,
       ~isFetchingAtHead=false,
     )
@@ -44,10 +45,11 @@ let make = (
       let staticContractsChunk =
         staticContractsClone->Js.Array2.removeCountInPlace(~pos=0, ~count=maxAddrInPartition)
 
-      let staticContractPartition = FetchState.makeRoot(~endBlock)(
+      let staticContractPartition = FetchState.make(
         ~staticContracts=staticContractsChunk,
         ~dynamicContractRegistrations=[],
         ~startBlock,
+        ~endBlock,
         ~logger,
         ~isFetchingAtHead=false,
       )
@@ -58,13 +60,14 @@ let make = (
 
     //Add the rest of the static addresses filling the remainder of the partition with dynamic contract
     //registrations
-    let remainingStaticContractsWithDynamicPartition = FetchState.makeRoot(~endBlock)(
+    let remainingStaticContractsWithDynamicPartition = FetchState.make(
       ~staticContracts=staticContractsClone,
       ~dynamicContractRegistrations=dynamicContractRegistrationsClone->Js.Array2.removeCountInPlace(
         ~pos=0,
         ~count=maxAddrInPartition - staticContractsClone->Array.length,
       ),
       ~startBlock,
+      ~endBlock,
       ~logger,
       ~isFetchingAtHead=false,
     )
@@ -78,10 +81,11 @@ let make = (
           ~count=maxAddrInPartition,
         )
 
-      let dynamicContractPartition = FetchState.makeRoot(~endBlock)(
+      let dynamicContractPartition = FetchState.make(
         ~staticContracts=[],
         ~dynamicContractRegistrations=dynamicContractRegistrationsChunk,
         ~startBlock,
+        ~endBlock,
         ~logger,
         ~isFetchingAtHead=false,
       )
@@ -125,8 +129,9 @@ let registerDynamicContracts = (
       )
     partitions->Utils.Array.setIndexImmutable(newestPartitionIndex, updated)
   } else {
-    let newPartition = FetchState.makeRoot(~endBlock)(
+    let newPartition = FetchState.make(
       ~startBlock,
+      ~endBlock,
       ~logger,
       ~staticContracts=[],
       ~dynamicContractRegistrations=dynamicContractRegistration.dynamicContracts,

scenarios/test_codegen/test/lib_tests/FetchState_test.res

@@ -85,8 +85,9 @@ describe("FetchState.fetchState", () => {
   })
 
   it("dynamic contract registration", () => {
-    let root = makeRoot(~endBlock=None)(
+    let root = make(
       ~startBlock=10_000,
+      ~endBlock=None,
       ~staticContracts=[((Gravatar :> string), mockAddress1)],
       ~dynamicContractRegistrations=[],
       ~isFetchingAtHead=false,