Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Shelley get reward account balance #1752

Merged
merged 3 commits into from
Jun 13, 2020
Merged

Shelley get reward account balance #1752

merged 3 commits into from
Jun 13, 2020

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Jun 12, 2020 •
edited
Loading

Issue Number

ADP-302 / #1750

Overview

Adds implementation of network layer getAccountBalance for shelley.

Comments

The integration test is not passing because stake pools are not connected with the test cluster network.

@rvl rvl self-assigned this Jun 12, 2020
@rvl rvl mentioned this pull request Jun 12, 2020
Closed
@paweljakubas paweljakubas force-pushed the rvl/adp-302/get-reward-account-balance branch 2 times, most recently from 4b20e94 to cdc3687 Compare June 12, 2020 19:33
@rvl rvl changed the title wip: Shelley get reward account balance Shelley get reward account balance Jun 13, 2020
@rvl rvl force-pushed the rvl/adp-302/get-reward-account-balance branch from b1e8bfc to 496919f Compare June 13, 2020 05:27
@rvl rvl marked this pull request as ready for review June 13, 2020 05:29
@rvl rvl force-pushed the rvl/adp-302/get-reward-account-balance branch from 496919f to 12cd04e Compare June 13, 2020 07:55
paweljakubas
paweljakubas approved these changes Jun 13, 2020
View reviewed changes
Copy link
Contributor

@paweljakubas paweljakubas left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great job! just make the test pending before we can run it, also change Delegations type alias a little bit using the type aliases from cardano-api (as we use them below):

type ShelleyCredentialStaking            = Shelley.Credential Shelley.Staking Shelley.TPraosStandardCrypto
type ShelleyVerificationKeyHashStakePool = Shelley.KeyHash Shelley.StakePool Shelley.TPraosStandardCrypto

(https://github.com/input-output-hk/cardano-node/blob/master/cardano-api/src/Cardano/Api/Types.hs#L144 and https://github.com/input-output-hk/cardano-node/blob/master/cardano-api/src/Cardano/Api/Types.hs#L153)

@paweljakubas paweljakubas requested review from KtorZ and Anviking June 13, 2020 09:32
Anviking
Anviking approved these changes Jun 13, 2020
View reviewed changes
Copy link
Member

@Anviking Anviking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@paweljakubas paweljakubas force-pushed the rvl/adp-302/get-reward-account-balance branch from a418222 to b8e57e4 Compare June 13, 2020 12:56
@paweljakubas
Copy link
Contributor

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jun 13, 2020

Build succeeded

@iohk-bors iohk-bors bot merged commit 22e5228 into master Jun 13, 2020
@iohk-bors iohk-bors bot deleted the rvl/adp-302/get-reward-account-balance branch June 13, 2020 13:39
Anviking
Anviking reviewed Jun 13, 2020
View reviewed changes
lib/shelley/src/Cardano/Wallet/Shelley/Network.hs

action
NetworkLayer
{ currentNodeTip = liftIO $ _currentNodeTip nodeTipVar
, nextBlocks = _nextBlocks
, initCursor = _initCursor
, initCursor = _initCursor queryRewardQ
Copy link
Member

@Anviking Anviking Jun 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, why is queryRewardQ both read from by the shared connectDelegationRewardsClient and each wallet client? That seems odd. Shouldn't queryRewardQ only be handled by the shared client?

trying removing it on my branch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. I meant to remove that.

rvl added a commit that referenced this pull request Jun 13, 2020
@rvl
Shelley network: remove queryRewardQ from wallet client
e8ed653 
Review comment:
#1752 (comment)
@rvl rvl mentioned this pull request Jun 13, 2020
Merged
rvl added a commit that referenced this pull request Jun 13, 2020
@rvl
Shelley network: remove queryRewardQ from wallet client
a63c4c4 
Review comment:
#1752 (comment)
iohk-bors bot added a commit that referenced this pull request Jun 14, 2020
@iohk-bors @rvl
Merge #1757
0fd7262 
1757: Shelley network: remove queryRewardQ from wallet client r=rvl a=rvl

### Issue Number

ADP-302 / #1750

### Overview

Review comment:
#1752 (comment)



Co-authored-by: Rodney Lorrimar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anviking Anviking Anviking approved these changes

@paweljakubas paweljakubas paweljakubas approved these changes

@KtorZ KtorZ Awaiting requested review from KtorZ

Assignees

@rvl rvl

Labels
None yet
Projects
None yet
Milestone
(ADP-302) Check reward account balance
Development

Successfully merging this pull request may close these issues.
3 participants
@rvl @paweljakubas @Anviking