Add prefixes "Rest" to public tuples.

beacon_chain/rpc/beacon_rest_api.nim

@@ -24,22 +24,22 @@ const
   MaximumValidatorIds = 30
 
 type
-  ValidatorTuple = tuple
+  RestValidatorTuple = tuple
     index: ValidatorIndex
     balance: string
     status: string
     validator: Validator
 
-  ValidatorBalanceTuple = tuple
+  RestValidatorBalanceTuple = tuple
     index: ValidatorIndex
     balance: string
 
-  BeaconStatesCommitteesTuple* = tuple
+  RestBeaconStatesCommitteesTuple* = tuple
     index: CommitteeIndex
     slot: Slot
     validators: seq[ValidatorIndex]
 
-  FailureTuple* = tuple
+  RestAttestationsFailureTuple* = tuple
     index: uint64
     message: string
 
@@ -255,7 +255,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
 
     node.withStateForBlockSlot(bslot):
       let current_epoch = get_current_epoch(node.chainDag.headState.data.data)
-      var res: seq[ValidatorTuple]
+      var res: seq[RestValidatorTuple]
       for index, validator in state().validators.pairs():
         let r1 =
           if len(keySet) == 0:
@@ -383,7 +383,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
         (res1, res2)
     node.withStateForBlockSlot(bslot):
       let current_epoch = get_current_epoch(node.chainDag.headState.data.data)
-      var res: seq[ValidatorBalanceTuple]
+      var res: seq[RestValidatorBalanceTuple]
       for index, validator in state().validators.pairs():
         let rflag =
           if (len(keySet) == 0) and (len(indexSet) == 0):
@@ -446,13 +446,13 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
         none[Slot]()
     node.withStateForBlockSlot(bslot):
       proc getCommittee(slot: Slot,
-                        index: CommitteeIndex): BeaconStatesCommitteesTuple =
+                       index: CommitteeIndex): RestBeaconStatesCommitteesTuple =
         let validators = get_beacon_committee(state, slot, index,
                                               cache).mapIt(it)
         (index: index, slot: slot, validators: validators)
 
       proc forSlot(slot: Slot, cindex: Option[CommitteeIndex],
-                   res: var seq[BeaconStatesCommitteesTuple]) =
+                   res: var seq[RestBeaconStatesCommitteesTuple]) =
         let committees_per_slot =
           get_committee_count_per_slot(state, Epoch(slot), cache)
 
@@ -464,7 +464,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
           if uint64(idx) < committees_per_slot:
             res.add(getCommittee(slot, CommitteeIndex(idx)))
 
-      var res: seq[BeaconStatesCommitteesTuple]
+      var res: seq[RestBeaconStatesCommitteesTuple]
       let qepoch =
         if vepoch.isNone:
           compute_epoch_at_slot(state().slot)
@@ -638,7 +638,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
                                            $dres.error())
         dres.get()
 
-    var failures: seq[FailureTuple]
+    var failures: seq[RestAttestationsFailureTuple]
     for atindex, attestation in attestations.pairs():
       let wallTime = node.processor.getWallTime()
       let res = node.attestationPool[].validateAttestation(

beacon_chain/rpc/nimbus_rest_api.nim

@@ -19,26 +19,26 @@ import
 logScope: topics = "rest_nimbusapi"
 
 type
-  PeerInfoTuple* = tuple
+  RestPeerInfoTuple* = tuple
     peerId: string
     addrs: seq[string]
     protocols: seq[string]
     protoVersion: string
     agentVersion: string
 
-  SimplePeerTuple* = tuple
-    info: PeerInfoTuple
+  RestSimplePeerTuple* = tuple
+    info: RestPeerInfoTuple
     connectionState: string
     score: int
 
-  FutureInfoTuple* = tuple
+  RestFutureInfoTuple* = tuple
     id: int
     procname: string
     filename: string
     line: int
     state: string
 
-  PubSubPeerTuple* = tuple
+  RestPubSubPeerTuple* = tuple
     peerId: PeerID
     score: float64
     iWantBudget: int
@@ -53,18 +53,18 @@ type
     backoff: string
     agent: string
 
-  PeerStatsTuple* = tuple
+  RestPeerStatsTuple* = tuple
     peerId: PeerID
     null: bool
     connected: bool
     expire: string
     score: float64
 
-  PeerStatusTuple* = tuple
+  RestPeerStatusTuple* = tuple
     peerId: PeerID
     connected: bool
 
-proc toNode(v: PubSubPeer, backoff: Moment): PubSubPeerTuple =
+proc toNode(v: PubSubPeer, backoff: Moment): RestPubSubPeerTuple =
   (
     peerId: v.peerId,
     score: v.score,
@@ -130,7 +130,7 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
 
   router.api(MethodGet, "/api/nimbus/v1/network/peers") do (
     ) -> RestApiResponse:
-    var res: seq[SimplePeerTuple]
+    var res: seq[RestSimplePeerTuple]
     for id, peer in node.network.peerPool:
       res.add((
         info: shortLog(peer.info),
@@ -191,7 +191,7 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
   router.api(MethodGet, "/api/nimbus/v1/debug/chronos/futures") do (
     ) -> RestApiResponse:
     when defined(chronosFutureTracking):
-      var res: seq[FutureInfoTuple]
+      var res: seq[RestFutureInfoTuple]
       for item in pendingFutures():
         let loc = item.location[LocCreateIndex][]
         res.add(
@@ -213,9 +213,9 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
 
     let gossipPeers =
       block:
-        var res: seq[tuple[topic: string, peers: seq[PubSubPeerTuple]]]
+        var res: seq[tuple[topic: string, peers: seq[RestPubSubPeerTuple]]]
         for topic, v in node.network.pubsub.gossipsub:
-          var peers: seq[PubSubPeerTuple]
+          var peers: seq[RestPubSubPeerTuple]
           let backoff = node.network.pubsub.backingOff.getOrDefault(topic)
           for peer in v:
             peers.add(peer.toNode(backOff.getOrDefault(peer.peerId)))
@@ -223,9 +223,9 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
         res
     let meshPeers =
       block:
-        var res: seq[tuple[topic: string, peers: seq[PubSubPeerTuple]]]
+        var res: seq[tuple[topic: string, peers: seq[RestPubSubPeerTuple]]]
         for topic, v in node.network.pubsub.mesh:
-          var peers: seq[PubSubPeerTuple]
+          var peers: seq[RestPubSubPeerTuple]
           let backoff = node.network.pubsub.backingOff.getOrDefault(topic)
           for peer in v:
             peers.add(peer.toNode(backOff.getOrDefault(peer.peerId)))
@@ -242,7 +242,7 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
         res
     let peerStats =
       block:
-        var stats: seq[PeerStatsTuple]
+        var stats: seq[RestPeerStatsTuple]
         for peerId, pstats in node.network.pubsub.peerStats:
           let peer = node.network.pubsub.peers.getOrDefault(peerId)
           stats.add(
@@ -257,7 +257,7 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
         stats
     let allPeers =
       block:
-        var peers: seq[PeerStatusTuple]
+        var peers: seq[RestPeerStatusTuple]
         for peerId, peer in node.network.pubsub.peers:
           peers.add((peerId: peerId, connected: peer.connected))
         peers

beacon_chain/rpc/validator_rest_api.nim

@@ -19,7 +19,7 @@ import
 logScope: topics = "rest_validatorapi"
 
 type
-  AttesterDutyTuple* = tuple
+  RestAttesterDutyTuple* = tuple
     pubkey: ValidatorPubKey
     validator_index: ValidatorIndex
     committee_index: CommitteeIndex
@@ -28,12 +28,12 @@ type
     validator_committee_index: ValidatorIndex
     slot: Slot
 
-  ProposerDutyTuple* = tuple
+  RestProposerDutyTuple* = tuple
     pubkey: ValidatorPubKey
     validator_index: ValidatorIndex
     slot: Slot
 
-  CommitteeSubscriptionTuple* = tuple
+  RestCommitteeSubscriptionTuple* = tuple
     validator_index: ValidatorIndex
     committee_index: CommitteeIndex
     committees_at_slot: uint64
@@ -92,7 +92,7 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) =
         node.chainDag.genesis.root
     let duties =
       block:
-        var res: seq[AttesterDutyTuple]
+        var res: seq[RestAttesterDutyTuple]
         let epochRef = node.chainDag.getEpochRef(qhead, qepoch)
         let committees_per_slot = get_committee_count_per_slot(epochRef)
         for i in 0 ..< SLOTS_PER_EPOCH:
@@ -162,7 +162,7 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) =
         node.chainDag.genesis.root
     let duties =
       block:
-        var res: seq[ProposerDutyTuple]
+        var res: seq[RestProposerDutyTuple]
         let epochRef = node.chainDag.getEpochRef(qhead, qepoch)
         for i in 0 ..< SLOTS_PER_EPOCH:
           if epochRef.beacon_proposers[i].isSome():
@@ -341,7 +341,7 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) =
       block:
         if contentBody.isNone():
           return RestApiResponse.jsonError(Http400, "Empty request's body")
-        let dres = decodeBody(seq[CommitteeSubscriptionTuple],
+        let dres = decodeBody(seq[RestCommitteeSubscriptionTuple],
                               contentBody.get())
         if dres.isErr():
           return RestApiResponse.jsonError(Http400, "Unable to decode " &