Rename slot field to absolute_slot_number

cardano-foundation · Sep 22, 2020 · ae312fe · ae312fe
1 parent 8d8565b
commit ae312fe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Network.hs
@@ -67,7 +67,7 @@ spec = describe "COMMON_NETWORK" $ do
             (epochStartTime <$> nextEpoch i) .> Just now
             verify r
                 [ expectField (#syncProgress . #getApiT) (`shouldBe` Ready)
-                , expectField (#nodeTip . #slot . #getApiT) (`shouldNotBe` 0)
+                , expectField (#nodeTip . #absoluteSlotNumber . #getApiT) (`shouldNotBe` 0)
                 ]
 
             let Just currentEpochNum = getApiT . (view #epochNumber) <$> (i ^. #networkTip)
@@ -91,7 +91,7 @@ spec = describe "COMMON_NETWORK" $ do
                 let blockHeight =
                         getFromResponse (#nodeTip . #height) sync
                 let absSlot =
-                        getFromResponse (#nodeTip . #slot) sync
+                        getFromResponse (#nodeTip . #absoluteSlotNumber) sync
 
                 res <- request @ApiByronWallet ctx
                     (Link.getWallet @'Byron w) Default Empty
@@ -100,7 +100,7 @@ spec = describe "COMMON_NETWORK" $ do
                     , expectField (#tip . #epochNumber . #getApiT) (`shouldBe` epochNum)
                     , expectField (#tip . #slotNumber  . #getApiT) (`shouldBe` slotNum)
                     , expectField (#tip . #height) (`shouldBe` blockHeight)
-                    , expectField (#tip . #slot) (`shouldBe` absSlot)
+                    , expectField (#tip . #absoluteSlotNumber) (`shouldBe` absSlot)
                     ]
 
     it "NETWORK_CLOCK - Can query network clock" $ \ctx -> do

diff --git a/lib/core/src/Cardano/Wallet/Api/Server.hs b/lib/core/src/Cardano/Wallet/Api/Server.hs
@@ -1831,7 +1831,7 @@ mkApiTransaction ti txid ins outs ws (meta, timestamp) txMeta setTimeReference =
                     { epochNumber = ApiT $ slotId ^. #epochNumber
                     , slotNumber = ApiT $ slotId ^. #slotNumber
                     , height = natural (meta ^. #blockHeight)
-                    , slot = ApiT $ meta ^. #slotNo
+                    , absoluteSlotNumber = ApiT $ meta ^. #slotNo
                     }
 
     toAddressAmount :: TxOut -> AddressAmount (ApiT Address, Proxy n)
@@ -1871,7 +1871,7 @@ mkApiBlockReference ti tip = do
         { epochNumber = ApiT $ slotId ^. #epochNumber
         , slotNumber = ApiT $ slotId ^. #slotNumber
         , height = natural $ tip ^. #blockHeight
-        , slot = ApiT $ slotNo tip
+        , absoluteSlotNumber = ApiT $ slotNo tip
         }
 
 getWalletTip

diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -615,13 +615,13 @@ data ApiBlockReference = ApiBlockReference
     { epochNumber :: !(ApiT EpochNo)
     , slotNumber :: !(ApiT SlotInEpoch)
     , height :: !(Quantity "block" Natural)
-    , slot :: !(ApiT SlotNo)
+    , absoluteSlotNumber :: !(ApiT SlotNo)
     } deriving (Eq, Generic, Show)
 
 data ApiNetworkTip = ApiNetworkTip
     { epochNumber :: !(ApiT EpochNo)
     , slotNumber :: !(ApiT SlotInEpoch)
-    , slot :: !(ApiT SlotNo)
+    , absoluteSlotNumber :: !(ApiT SlotNo)
     } deriving (Eq, Generic, Show)
 
 data ApiNetworkInformation = ApiNetworkInformation

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -777,7 +777,7 @@ spec = do
                     { slotNumber = slotNumber (x :: ApiBlockReference)
                     , epochNumber = epochNumber (x :: ApiBlockReference)
                     , height = height (x :: ApiBlockReference)
-                    , slot = slot (x :: ApiBlockReference)
+                    , absoluteSlotNumber = absoluteSlotNumber (x :: ApiBlockReference)
                     }
             in
                 x' === x .&&. show x' === show x
@@ -786,7 +786,7 @@ spec = do
                 x' = ApiNetworkTip
                     { slotNumber = slotNumber (x :: ApiNetworkTip)
                     , epochNumber = epochNumber (x :: ApiNetworkTip)
-                    , slot = slot (x :: ApiNetworkTip)
+                    , absoluteSlotNumber = absoluteSlotNumber (x :: ApiNetworkTip)
                     }
             in
                 x' === x .&&. show x' === show x

diff --git a/specifications/api/swagger.yaml b/specifications/api/swagger.yaml
@@ -116,12 +116,12 @@ x-blockReference: &blockReference
     - slot_number
     - epoch_number
     - height
-    - slot
+    - absolute_slot_number
   properties:
     slot_number: *slotNumber
     epoch_number: *epochNumber
     height: *numberOfBlocks
-    slot: *absoluteSlot
+    absolute_slot_number: *absoluteSlot
 
 x-genesisBlock: &genesisBlock
   description: A reference to a particular block.
@@ -902,11 +902,11 @@ components:
       required:
         - slot_number
         - epoch_number
-        - slot
+        - absolute_slot_number
       properties:
         slot_number: *slotNumber
         epoch_number: *epochNumber
-        slot: *absoluteSlot
+        absolute_slot_number: *absoluteSlot
 
     ApiNetworkInformation: &ApiNetworkInformation
       type: object