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.

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

storage market accounts, do not stop loadinng account after asset match #2136

Merged
merged 2 commits into from
Aug 26, 2020

Conversation

jeremyletang
Copy link
Member

closes #2122

@ponthief ponthief self-requested a review August 25, 2020 08:48
@jeremyletang jeremyletang requested a review from a team August 25, 2020 08:49
@vega-ci-bot
Copy link
Collaborator

system-tests failed.

=== Test summary ===
../../grpcTesting/governance/newMarketGovTests.py .....................x [ 47%]
........................                                                 [100%]
../../grpcTesting/governance/newMarketTradesTests.py ............        [100%]
../../grpcTesting/margins/marginsTests.py x..x                           [100%]
../../grpcTesting/markets/marketsTests.py ..............                 [100%]
../../grpcTesting/orders/amendOrdersTests.py .ssssssssssssssssssssssssss [ 81%]
ssssss                                                                   [100%]
../../grpcTesting/orders/cancelOrdersTests.py .....................s.s   [100%]
../../grpcTesting/orders/generalOrdersTests.py .............             [100%]
../../grpcTesting/orders/limitOrdersTests.py ............                [100%]
../../grpcTesting/orders/marketOrdersTests.py ........                   [100%]
../../grpcTesting/orders/mixedOrdersTests.py ..................sss       [100%]
../../grpcTesting/orders/negativeOrdersTests.py ........................ [ 57%]
....x..ssssss.s...                                                       [100%]
../../grpcTesting/parties/partiesTests.py ..                             [100%]
../../grpcTesting/trading/positionsTests.py ..                           [100%]
../../grpcTesting/trading/tradesTests.py FF............                  [100%]
 testCheckFeesAggresiveSell 
 testCheckFeesAggresiveBuy 
../../grpcTesting/wallet/walletTests.py ................................ [ 91%]
.s.                                                                      [100%]
../../rest/orders/negativeOrdersTests.py .                               [100%]

Copy link

@qustavo qustavo left a comment

Choose a reason for hiding this comment

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

LGTM

We have the same pattern in GetFeeInfrastructureAccounts, you think we need to remove the break statement there as well?

@jeremyletang
Copy link
Member Author

jeremyletang commented Aug 25, 2020

LGTM

We have the same pattern in GetFeeInfrastructureAccounts, you think we need to remove the break statement there as well?

Yes same patttern is here, but in the case of the infrastructure fee account we will get one infrastructure fee account per asset only, the early exit makes sense there as as soon as we find the account for the required asset, we know it's the only one.

It was the same thing until recently for the market account as we were looking only for the insurance pool account, although we added the Liquidity fee account recently, which indeed was not returned if we were breaking after we find the first account with matching asset.

@edd
Copy link
Member

edd commented Aug 25, 2020

LGTM
We have the same pattern in GetFeeInfrastructureAccounts, you think we need to remove the break statement there as well?

Yes same patttern is here, but in the case of the infrastructure fee account we will get one infrastructure fee account per asset only, the early exit makes sense there as as soon as we find the account for the required asset, we know it's the only one.

It was the same thing until recently for the market account as we were looking only for the insurance pool account, although we added the Liquidity fee account recently, which indeed was not returned if we were breaking after we find the first account with matching asset.

Could you put in a comment so that's clear @jeremyletang? Then I'm happy to merge it.

@jeremyletang
Copy link
Member Author

LGTM
We have the same pattern in GetFeeInfrastructureAccounts, you think we need to remove the break statement there as well?

Yes same patttern is here, but in the case of the infrastructure fee account we will get one infrastructure fee account per asset only, the early exit makes sense there as as soon as we find the account for the required asset, we know it's the only one.
It was the same thing until recently for the market account as we were looking only for the insurance pool account, although we added the Liquidity fee account recently, which indeed was not returned if we were breaking after we find the first account with matching asset.

Could you put in a comment so that's clear @jeremyletang? Then I'm happy to merge it.

done

@vega-ci-bot
Copy link
Collaborator

system-tests failed.

=== Test summary ===
../../grpcTesting/governance/newAssetTests.py ..F......x............x.ss [ 89%]
sss                                                                      [100%]
 testDepositBuiltInAmtGreatMaxDep 
../../grpcTesting/governance/newMarketGovTests.py .....................x [ 47%]
........................                                                 [100%]
../../grpcTesting/governance/newMarketTradesTests.py ............        [100%]
../../grpcTesting/margins/marginsTests.py x..x                           [100%]
../../grpcTesting/markets/marketsTests.py ..............                 [100%]
../../grpcTesting/orders/amendOrdersTests.py .ssssssssssssssssssssssssss [ 81%]
ssssss                                                                   [100%]
../../grpcTesting/orders/cancelOrdersTests.py .....................s.s   [100%]
../../grpcTesting/orders/generalOrdersTests.py .............             [100%]
../../grpcTesting/orders/limitOrdersTests.py ............                [100%]
../../grpcTesting/orders/marketOrdersTests.py ........                   [100%]
../../grpcTesting/orders/mixedOrdersTests.py ..................sss       [100%]
../../grpcTesting/orders/negativeOrdersTests.py ........................ [ 57%]
....x..ssssss.s...                                                       [100%]
../../grpcTesting/parties/partiesTests.py ..                             [100%]
../../grpcTesting/trading/positionsTests.py ..                           [100%]
../../grpcTesting/trading/tradesTests.py FF............                  [100%]
 testCheckFeesAggresiveSell 
 testCheckFeesAggresiveBuy 
../../grpcTesting/wallet/walletTests.py ................................ [ 91%]
.s.                                                                      [100%]
../../rest/orders/negativeOrdersTests.py .                               [100%]

@edd edd merged commit 09c9f17 into develop Aug 26, 2020
@edd edd mentioned this pull request Sep 1, 2020
10 tasks
@ashleyvega ashleyvega deleted the bugfix/2122-filter-by-market-id-liquidity-infra branch November 5, 2020 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

proto MarketAccounts - only Insurance account displayed when assetId specified as the argument
4 participants