Expose max collateral input count (protocol parameter) #2818

sevanspowell · 2021-08-11T04:51:30Z

Overview

Expose the maximum number of collateral inputs in the wallet API.

Add maximumCollateralInputCount field to ApiNetworkParameters type.
Add maximum_collateral_input_count field to API.
Modify Scenario/API/Shelley/Network integration test to test it can retrieve maxCollateralInputs from the alonzo-genesis.yaml.

Issue Number

ADP-1061

sevanspowell · 2021-08-11T08:19:36Z

bors try

jonathanknowles

Hi @sevanspowell

Looks good so far. I've made some suggestions regarding the names of things. (See comments.)

specifications/api/swagger.yaml

lib/core/src/Cardano/Wallet/Api/Types.hs

iohk-bors · 2021-08-11T09:21:57Z

try

Build failed:

buildkite/cardano-wallet

sevanspowell · 2021-08-12T07:51:10Z

bors try

jonathanknowles

Looks good to me!

I only have one very small suggestion. (See comment!)

lib/core-integration/src/Test/Integration/Framework/DSL.hs

sevanspowell · 2021-08-16T07:29:36Z

bors r+

2818: Expose max collateral input count (protocol parameter) r=sevanspowell a=sevanspowell ### Overview Expose the maximum number of collateral inputs in the wallet API. - Add `maximumCollateralInputCount` field to `ApiNetworkParameters` type. - Add `maximum_collateral_input_count` field to API. - Modify Scenario/API/Shelley/Network integration test to test it can retrieve `maxCollateralInputs` from the `alonzo-genesis.yaml`. ### Issue Number ADP-1061 Co-authored-by: Samuel Evans-Powell <[email protected]>

iohk-bors · 2021-08-16T07:39:23Z

Build failed:

buildkite/cardano-wallet

cardano-wallet-core-integration> /build/cardano-wallet/lib/core-integration/src/Test/Integration/Framework/DSL.hs:683:1: error:
--
  | cardano-wallet-core-integration>     The type signature for ‘maximumCollateralInputCount’
  | cardano-wallet-core-integration>       lacks an accompanying binding
  | cardano-wallet-core-integration>       (The type signature must be given where ‘maximumCollateralInputCount’ is declared)
  | cardano-wallet-core-integration>     \|
  | cardano-wallet-core-integration> 683 \| maximumCollateralInputCount :: ApiEra -> Word16
  | cardano-wallet-core-integration>     \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  | cardano-wallet-core-integration>
  | cardano-wallet-core            > Benchmark running disabled by --no-run-benchmarks flag.

#expected

- Add "maximumCollateralInputs" field to `ApiNetworkParameters` type. - Add "maximum_collateral_inputs" field to API. - Modify Scenario/API/Shelley/Network integration test to test it can retrieve `maxCollateralInputs` from the `alonzo-genesis.yaml`. - Make maximumCollateralInputCount expected value depend on era, otherwise integration tests only work in Alonzo era, as the maximum collateral input count value was only introduced in the Alonzo era. Co-authored-by: Jonathan Knowles <[email protected]>

sevanspowell · 2021-08-16T08:31:17Z

bors r+

2818: Expose max collateral input count (protocol parameter) r=sevanspowell a=sevanspowell ### Overview Expose the maximum number of collateral inputs in the wallet API. - Add `maximumCollateralInputCount` field to `ApiNetworkParameters` type. - Add `maximum_collateral_input_count` field to API. - Modify Scenario/API/Shelley/Network integration test to test it can retrieve `maxCollateralInputs` from the `alonzo-genesis.yaml`. ### Issue Number ADP-1061 Co-authored-by: Samuel Evans-Powell <[email protected]>

iohk-bors · 2021-08-16T09:30:14Z

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

2818: Expose max collateral input count (protocol parameter) r=sevanspowell a=sevanspowell ### Overview Expose the maximum number of collateral inputs in the wallet API. - Add `maximumCollateralInputCount` field to `ApiNetworkParameters` type. - Add `maximum_collateral_input_count` field to API. - Modify Scenario/API/Shelley/Network integration test to test it can retrieve `maxCollateralInputs` from the `alonzo-genesis.yaml`. ### Issue Number ADP-1061 Co-authored-by: Samuel Evans-Powell <[email protected]>

iohk-bors · 2021-08-16T11:19:41Z

Build failed:

ci/hydra-build:required

/nix/store/sv61k1l9fapkn1dzlvclqjl5i1sbhfyw-stdenv-darwin/setup: line 90: [: missing `]'

Integration tests passed, but then the above happened 🤨

sevanspowell · 2021-08-17T02:00:28Z

bors retry

2818: Expose max collateral input count (protocol parameter) r=sevanspowell a=sevanspowell ### Overview Expose the maximum number of collateral inputs in the wallet API. - Add `maximumCollateralInputCount` field to `ApiNetworkParameters` type. - Add `maximum_collateral_input_count` field to API. - Modify Scenario/API/Shelley/Network integration test to test it can retrieve `maxCollateralInputs` from the `alonzo-genesis.yaml`. ### Issue Number ADP-1061 Co-authored-by: Samuel Evans-Powell <[email protected]>

iohk-bors · 2021-08-17T03:03:41Z

Build failed:

ci/hydra-build:required

  src/Test/Integration/Scenario/CLI/Shelley/Wallets.hs:448:49: 
  1) CLI Specifications, SHELLEY_CLI_WALLETS, WALLETS_GET_01 - Can get a wallet
       Waited longer than 90s to resolve action: "Wallet state = Ready".
[cardano-wallet.network:Warning:50585] [2021-08-17 03:03:37.17 UTC] Connection lost with the node. Network.Socket.recvBuf: resource vanished (Connection reset by peer)
       expected: Ready
        but got: Syncing (Quantity (Percentage (4913 % 5000)))

  To rerun use: --match "/CLI Specifications/SHELLEY_CLI_WALLETS/WALLETS_GET_01 - Can get a wallet/"

Randomized with seed 1319616375

#2855

sevanspowell · 2021-08-17T03:57:58Z

bors retry

iohk-bors · 2021-08-17T05:01:13Z

Build succeeded:

sevanspowell · 2021-08-17T05:40:41Z

Thanks bors 😅

iohk-bors · 2021-08-18T18:13:16Z

try

Merge conflict.

sevanspowell requested review from jonathanknowles and rvl August 11, 2021 04:51

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch from 9344b73 to 4e4fd4c Compare August 11, 2021 05:30

Base automatically changed from sevanspowell/adp-958/maximum-collateral-inputs to master August 11, 2021 06:27

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch from e7fe03e to 54083fd Compare August 11, 2021 06:56

iohk-bors bot added a commit that referenced this pull request Aug 11, 2021

Try #2818:

d3e54e0

jonathanknowles reviewed Aug 11, 2021

View reviewed changes

specifications/api/swagger.yaml Outdated Show resolved Hide resolved

specifications/api/swagger.yaml Outdated Show resolved Hide resolved

lib/core/src/Cardano/Wallet/Api/Types.hs Outdated Show resolved Hide resolved

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch 2 times, most recently from a9a2c95 to eba0790 Compare August 12, 2021 02:53

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch from c3acfbc to b972719 Compare August 16, 2021 06:14

jonathanknowles changed the title ~~Expose max collateral inputs~~ Expose max collateral input count (protocol parameter) Aug 16, 2021

jonathanknowles approved these changes Aug 16, 2021

View reviewed changes

lib/core-integration/src/Test/Integration/Framework/DSL.hs Outdated Show resolved Hide resolved

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch from 3ab2d79 to 933f2eb Compare August 16, 2021 07:26

sevanspowell force-pushed the sevanspowell/adp-1061/expose-max-collateral-inputs branch from 933f2eb to 91f8f06 Compare August 16, 2021 07:45

iohk-bors bot merged commit 9110cbb into master Aug 17, 2021

iohk-bors bot deleted the sevanspowell/adp-1061/expose-max-collateral-inputs branch August 17, 2021 05:01

WilliamKingNoel-Bot pushed a commit that referenced this pull request Aug 17, 2021

docs: Merge #2818

ddf4073

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expose max collateral input count (protocol parameter) #2818

Expose max collateral input count (protocol parameter) #2818

sevanspowell commented Aug 11, 2021 •

edited by jonathanknowles

Loading

sevanspowell commented Aug 11, 2021

jonathanknowles left a comment

iohk-bors bot commented Aug 11, 2021

sevanspowell commented Aug 12, 2021

jonathanknowles left a comment

sevanspowell commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021 •

edited by Anviking

Loading

sevanspowell commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021 •

edited by Anviking

Loading

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 17, 2021 •

edited by Anviking

Loading

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 17, 2021

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 18, 2021

Expose max collateral input count (protocol parameter) #2818

Expose max collateral input count (protocol parameter) #2818

Conversation

sevanspowell commented Aug 11, 2021 • edited by jonathanknowles Loading

Overview

Issue Number

sevanspowell commented Aug 11, 2021

jonathanknowles left a comment

Choose a reason for hiding this comment

iohk-bors bot commented Aug 11, 2021

try

sevanspowell commented Aug 12, 2021

jonathanknowles left a comment

Choose a reason for hiding this comment

sevanspowell commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021 • edited by Anviking Loading

sevanspowell commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021

iohk-bors bot commented Aug 16, 2021 • edited by Anviking Loading

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 17, 2021 • edited by Anviking Loading

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 17, 2021

sevanspowell commented Aug 17, 2021

iohk-bors bot commented Aug 18, 2021

try

sevanspowell commented Aug 11, 2021 •

edited by jonathanknowles

Loading

iohk-bors bot commented Aug 16, 2021 •

edited by Anviking

Loading

iohk-bors bot commented Aug 16, 2021 •

edited by Anviking

Loading

iohk-bors bot commented Aug 17, 2021 •

edited by Anviking

Loading