Factor out guards into helpers in balanceTransaction #3092

Anviking · 2022-01-21T15:24:53Z

Factor out guards in balanceTransaction into helpers for readability

Comments

Preparation for other work.

Issue Number

jonathanknowles · 2022-01-27T09:36:25Z

lib/core/src/Cardano/Wallet.hs

+        -- Coin selection does not support pre-defining collateral. In Sep 2021
+        -- consensus was that we /could/ allow for it with just a day's work or so,
+        -- but that the need for it was unclear enough that it was not in any way
+        -- a priority.


I might be wrong, but suspect it would not just be "a day's work" 😄 .

😄 I thought that was what you said

Anviking · 2022-01-27T09:42:02Z

Thanks!
bors r+

3092: Factor out guards into helpers in balanceTransaction r=Anviking a=Anviking - [x] Factor out guards in balanceTransaction into helpers for readability ### Comments Preparation for other work. ### Issue Number ADP-1372 Co-authored-by: Johannes Lund <[email protected]>

iohk-bors · 2022-01-27T11:07:03Z

Build failed:

ci/hydra-build:required

Failures:

  src/Test/Integration/Framework/DSL.hs:1079:11:
  1) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_JOIN_01rewards - Can join a pool, earn rewards and collect them
       Quantity 0 does not satisfy (> Quantity 0)
       While verifying value:
         ( Status
             { statusCode = 200
             , statusMessage = "OK"
             }
         , Right
             ( ApiWallet
                 { id = ApiT
                     ( WalletId
                         { getWalletId = 08 a5be01a57642239a3c7bd27799c555fd297358 }
                     )
                 , addressPoolGap = ApiT
                     ( AddressPoolGap
                         { getAddressPoolGap = 20 }
                     )
                 , balance = ApiWalletBalance
                     { available = Quantity 999998854600
                     , total = Quantity 999998854600
                     , reward = Quantity 0
                     }
                 , assets = ApiWalletAssetsBalance
                     { available = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     , total = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     }
                 , delegation = ApiWalletDelegation
                     { active = ApiWalletDelegationNext
                         { status = Delegating
                         , target = Just
                             ( ApiT
                                 ( PoolId
                                     { getPoolId = "ì(ó=ËæÖ@
                                     \x1e^3\x9bÐd|\x9sÊl\xcùÂ»æ\x83\x8dÆ" }
                                 )
                             )
                         , changesAt = Nothing
                         }
                     , next = []
                     }
                 , name = ApiT
                     ( WalletName
                         { getWalletName = "Faucet Wallet" }
                     )
                 , passphrase = Just
                     ( ApiWalletPassphraseInfo 2022 - 01 - 27 10 : 54 : 31.439025 UTC )
                 , state = ApiT Ready
                 , tip = ApiBlockReference
                     { absoluteSlotNumber = ApiT
                         ( SlotNo 3848 )
                     , slotId = ApiSlotId
                         { epochNumber = ApiT
                             ( EpochNo
                                 { unEpochNo = 38 }
                             )
                         , slotNumber = ApiT
                             ( SlotInEpoch
                                 { unSlotInEpoch = 48 }
                             )
                         }
                     , time = 2022 - 01 - 27 10 : 56 : 41.6 UTC
                     , block = ApiBlockInfo
                         ( Quantity 1728 )
                     }
                 }
             )
         )

       Waited longer than 90s to resolve action: "Wallet gets rewards".

  To rerun use: --match "/API Specifications/SHELLEY_STAKE_POOLS/STAKE_POOLS_JOIN_01rewards - Can join a pool, earn rewards and collect them/"

  src/Test/Integration/Framework/DSL.hs:1079:11:
  2) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_JOIN_04 - Rewards accumulate
       Quantity 0 does not satisfy (> Quantity 0)
       While verifying value:
         ( Status
             { statusCode = 200
             , statusMessage = "OK"
             }
         , Right
             ( ApiWallet
                 { id = ApiT
                     ( WalletId { getWalletId = dca0d19c766a50575f25a326605f11eb9da36d6a } )
                 , addressPoolGap = ApiT
                     ( AddressPoolGap
                         { getAddressPoolGap = 20 }
                     )
                 , balance = ApiWalletBalance
                     { available = Quantity 999998854600
                     , total = Quantity 999998854600
                     , reward = Quantity 0
                     }
                 , assets = ApiWalletAssetsBalance
                     { available = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     , total = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     }
                 , delegation = ApiWalletDelegation
                     { active = ApiWalletDelegationNext
                         { status = Delegating
                         , target = Just
                             ( ApiT
                                 ( PoolId
                                     { getPoolId = "ì(ó=ËæÖ@
                                     \x1e^3\x9bÐd|\x9sÊl\xcùÂ»æ\x83\x8dÆ" }
                                 )
                             )
                         , changesAt = Nothing
                         }
                     , next = []
                     }
                 , name = ApiT
                     ( WalletName
                         { getWalletName = "Faucet Wallet" }
                     )
                 , passphrase = Just
                     ( ApiWalletPassphraseInfo 2022 - 01 - 27 10 : 56 : 12.549946 UTC )
                 , state = ApiT Ready
                 , tip = ApiBlockReference
                     { absoluteSlotNumber = ApiT
                         ( SlotNo 4348 )
                     , slotId = ApiSlotId
                         { epochNumber = ApiT
                             ( EpochNo
                                 { unEpochNo = 43 }
                             )
                         , slotNumber = ApiT
                             ( SlotInEpoch
                                 { unSlotInEpoch = 48 }
                             )
                         }
                     , time = 2022 - 01 - 27 10 : 58 : 21.6 UTC
                     , block = ApiBlockInfo
                         ( Quantity 1988 )
                     }
                 }
             )
         )

       Waited longer than 90s to resolve action: "Wallet gets rewards".

  To rerun use: --match "/API Specifications/SHELLEY_STAKE_POOLS/STAKE_POOLS_JOIN_04 - Rewards accumulate/"

  src/Test/Integration/Framework/DSL.hs:1079:11:
  3) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_LIST_01 - List stake pools, has non-zero saturation & stake
       Quantity (Percentage (0 % 1)) does not satisfy (> Quantity (Percentage (0 % 1)))
       While verifying value:
         ( Status
             { statusCode = 200
             , statusMessage = "OK"
             }
         , Right
             [ ApiStakePool
                 { id = ApiT
                     ( PoolId
                         { getPoolId = "ì(ó=ËæÖ@
                         \x1e^3\x9bÐd|\x9sÊl\xcùÂ»æ\x83\x8dÆ" }
                     )
                 , metrics = ApiStakePoolMetrics
                     { nonMyopicMemberRewards = Quantity 332039273903558
                     , relativeStake = Quantity
                         ( Percentage
                             ( 1 % 10000 )
                         )
                     , saturation = 1.6489070927498852 e- 4
                     , producedBlocks = Quantity 129
                     }
                 , metadata = Nothing
                 , cost = Quantity 0
                 , margin = Quantity
                     ( Percentage
                         ( 1 % 10 )
                     )
                 , pledge = Quantity 2000000000000
                 , retirement = Nothing
                 , flags = []
                 }
             , ApiStakePool
                 { id = ApiT
                     ( PoolId
                         { getPoolId = "»\x11L³}uú\x5&\x3(Â5£Úâ\x95£=\xb¦t¥ë\x1e>V\x8e" }
                     )
                 , metrics = ApiStakePoolMetrics
                     { nonMyopicMemberRewards = Quantity 332039146112728
                     , relativeStake = Quantity
                         ( Percentage
                             ( 0 % 1 )
                         )
                     , saturation = 6.790261334336803 e- 5
                     , producedBlocks = Quantity 65
                     }
                 , metadata = Nothing
                 , cost = Quantity 0
                 , margin = Quantity
                     ( Percentage
                         ( 1 % 10 )
                     )
                 , pledge = Quantity 1000000000000
                 , retirement = Just
                     ( ApiEpochInfo
                         { epochNumber = ApiT
                             ( EpochNo
                                 { unEpochNo = 1000000 }
                             )
                         , epochStartTime = 2022 - 09 - 15 22 : 17 : 12 UTC
                         }
                     )
                 , flags = []
                 }
             , ApiStakePool
                 { id = ApiT
                     ( PoolId
                         { getPoolId = "´WhÁ¢ÚKÑ>¼ª\x1e¥\x14\x8í£\x1dÌ!v\ËÔ\x7Í©ò" }
                     )
                 , metrics = ApiStakePoolMetrics
                     { nonMyopicMemberRewards = Quantity 143535959691936
                     , relativeStake = Quantity
                         ( Percentage
                             ( 4227 % 5000 )
                         )
                     , saturation = 2.5361830608857567
                     , producedBlocks = Quantity 1714
                     }
                 , metadata = Nothing
                 , cost = Quantity 0
                 , margin = Quantity
                     ( Percentage
                         ( 1 % 10 )
                     )
                 , pledge = Quantity 1000000000000
                 , retirement = Just
                     ( ApiEpochInfo
                         { epochNumber = ApiT
                             ( EpochNo
                                 { unEpochNo = 100000 }
                             )
                         , epochStartTime = 2022 - 02 - 19 14 : 17 : 12 UTC
                         }
                     )
                 , flags = []
                 }
             ]
         )

       Waited longer than 90s to resolve action: "list pools returns non-empty list".

  To rerun use: --match "/API Specifications/SHELLEY_STAKE_POOLS/STAKE_POOLS_LIST_01 - List stake pools/has non-zero saturation & stake/"

Randomized with seed 9888692

Finished in 1388.2676 seconds, used 429.8120 seconds of CPU time
896 examples, 3 failures, 48 pending

#3123 - only three failures, but could be related

Anviking · 2022-01-27T11:12:56Z

bors r+

3092: Factor out guards into helpers in balanceTransaction r=Anviking a=Anviking - [x] Factor out guards in balanceTransaction into helpers for readability ### Comments Preparation for other work. ### Issue Number ADP-1372 Co-authored-by: Johannes Lund <[email protected]>

iohk-bors · 2022-01-27T12:40:04Z

Build failed:

ci/hydra-build:required

Hydra unit timeout on linux (not mac where we had problems in the past). Last logs:

    signTransaction adds extra key witness when necessary (AnyCardanoEra MaryEra)
      +++ OK, passed 100 tests (100% feature not supported in MaryEra.).
    signTransaction adds extra key witness when necessary (AnyCardanoEra AlonzoEra) (74793ms)
      +++ OK, passed 100 tests.
    signTransaction adds tx in witnesses when necessary (AnyCardanoEra ByronEra) (1ms)
      +++ OK, passed 100 tests.

#2472

Anviking · 2022-01-27T14:34:31Z

bors r+

3092: Factor out guards into helpers in balanceTransaction r=Anviking a=Anviking - [x] Factor out guards in balanceTransaction into helpers for readability ### Comments Preparation for other work. ### Issue Number ADP-1372 Co-authored-by: Johannes Lund <[email protected]>

iohk-bors · 2022-01-27T16:04:46Z

Build failed:

ci/hydra-build:required

Finished in 2405.1621 seconds, used 1880.0654 seconds of CPU time
4280 examples, 0 failures, 43 pending

Apparently a Mac unit test timeout after the tests completed.

#2472

Anviking · 2022-01-27T16:37:18Z

bors r+

3092: Factor out guards into helpers in balanceTransaction r=Anviking a=Anviking - [x] Factor out guards in balanceTransaction into helpers for readability ### Comments Preparation for other work. ### Issue Number ADP-1372 Co-authored-by: Johannes Lund <[email protected]>

iohk-bors · 2022-01-27T17:59:20Z

Build failed:

ci/hydra-build:required

  src/Test/Integration/Scenario/API/Shelley/StakePools.hs:524:5: 
  1) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_JOIN_01 - Can rejoin another stakepool
       uncaught exception: IOException of type UserError
       user error (next delegation should contain exactly one element)

  To rerun use: --match "/API Specifications/SHELLEY_STAKE_POOLS/STAKE_POOLS_JOIN_01 - Can rejoin another stakepool/"

Randomized with seed 136491391

Anviking · 2022-01-27T18:25:11Z

bors r+

3092: Factor out guards into helpers in balanceTransaction r=Anviking a=Anviking - [x] Factor out guards in balanceTransaction into helpers for readability ### Comments Preparation for other work. ### Issue Number ADP-1372 Co-authored-by: Johannes Lund <[email protected]>

iohk-bors · 2022-01-27T21:30:36Z

Build failed:

ci/hydra-build:required

src/Test/Integration/Framework/DSL.hs:1079:11:
  1) API Specifications, SHELLEY_STAKE_POOLS, STAKE_POOLS_JOIN_01rewards - Can join a pool, earn rewards and collect them
       Quantity 0 does not satisfy (> Quantity 0)
       While verifying value:
         ( Status
             { statusCode = 200
             , statusMessage = "OK"
             }
         , Right
             ( ApiWallet
                 { id = ApiT
                     ( WalletId
                         { getWalletId = 08 a5be01a57642239a3c7bd27799c555fd297358 }
                     )
                 , addressPoolGap = ApiT
                     ( AddressPoolGap
                         { getAddressPoolGap = 20 }
                     )
                 , balance = ApiWalletBalance
                     { available = Quantity 999998854600
                     , total = Quantity 999998854600
                     , reward = Quantity 0
                     }
                 , assets = ApiWalletAssetsBalance
                     { available = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     , total = ApiT
                         ( TokenMap
                             ( fromList [] )
                         )
                     }
                 , delegation = ApiWalletDelegation
                     { active = ApiWalletDelegationNext
                         { status = Delegating
                         , target = Just
                             ( ApiT
                                 ( PoolId
                                     { getPoolId = "ì(ó=ËæÖ@
                                     \x1e^3\x9bÐd|\x9sÊl\xcùÂ»æ\x83\x8dÆ" }
                                 )
                             )
                         , changesAt = Nothing
                         }
                     , next = []
                     }
                 , name = ApiT
                     ( WalletName
                         { getWalletName = "Faucet Wallet" }
                     )
                 , passphrase = Just
                     ( ApiWalletPassphraseInfo 2022 - 01 - 27 19 : 40 : 49.004227 UTC )
                 , state = ApiT
                     ( Syncing
                         ( Quantity
                             ( Percentage
                                 ( 9279 % 10000 )
                             )
                         )
                     )
                 , tip = ApiBlockReference
                     { absoluteSlotNumber = ApiT
                         ( SlotNo 3585 )
                     , slotId = ApiSlotId
                         { epochNumber = ApiT
                             ( EpochNo
                                 { unEpochNo = 35 }
                             )
                         , slotNumber = ApiT
                             ( SlotInEpoch
                                 { unSlotInEpoch = 85 }
                             )
                         }
                     , time = 2022 - 01 - 27 19 : 41 : 56 UTC
                     , block = ApiBlockInfo
                         ( Quantity 1572 )
                     }
                 }
             )
         )

       Waited longer than 90s to resolve action: "Wallet gets rewards".

A lot of stake pool related tests were failing, indicating something ended up wrong with the setup of one pool (have not looked close)

#3123

Anviking · 2022-01-27T21:59:10Z

Bors r+

iohk-bors · 2022-01-27T22:39:55Z

Build succeeded:

Factor out guards into helpers in balanceTransaction

6b471ce

Anviking self-assigned this Jan 21, 2022

Anviking requested a review from jonathanknowles January 21, 2022 17:09

jonathanknowles reviewed Jan 27, 2022

View reviewed changes

jonathanknowles approved these changes Jan 27, 2022

View reviewed changes

iohk-bors bot merged commit 47f1d23 into master Jan 27, 2022

iohk-bors bot deleted the anviking/ADP-1372/factor-guards branch January 27, 2022 22:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Factor out guards into helpers in balanceTransaction #3092

Factor out guards into helpers in balanceTransaction #3092

Anviking commented Jan 21, 2022

jonathanknowles Jan 27, 2022

Anviking Jan 27, 2022

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022

Factor out guards into helpers in balanceTransaction #3092

Factor out guards into helpers in balanceTransaction #3092

Conversation

Anviking commented Jan 21, 2022

Comments

Issue Number

jonathanknowles Jan 27, 2022

Choose a reason for hiding this comment

Anviking Jan 27, 2022

Choose a reason for hiding this comment

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 • edited by Anviking Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 • edited by Anviking Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 • edited by Anviking Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 • edited by Anviking Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 • edited by Anviking Loading

Anviking commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading

iohk-bors bot commented Jan 27, 2022 •

edited by Anviking

Loading