Feature/rewrite address api #126
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
young-work-young
added
the
ready to merge
Codecov Report
@@ Coverage Diff @@
## master #126 +/- ##
==========================================
- Coverage 60.18% 60.11% -0.07%
==========================================
Files 205 205
Lines 5771 5779 +8
Branches 276 263 -13
==========================================
+ Hits 3473 3474 +1
- Misses 2298 2305 +7
Continue to review full report at Codecov.
|
ncying
reviewed
Aug 29, 2019
| if(stateSettings.txTypeAccountTxIds){ | ||
| val txNum = state.txTypeAccTxLengths(TransactionType.LeaseTransaction, a) | ||
| val txIds = state.txTypeAccountTxIds(TransactionType.LeaseTransaction, a, txNum, 0) | ||
| if (txIds._2 != null && txIds._2.size > 0) { |
young-work-young
removed
the
ready to merge
utolp
reviewed
Aug 29, 2019
| ) | ||
| res match { | ||
| case Some(tx) => complete(Json.arr(JsArray(tx))) | ||
| case None => complete(StatusCodes.NotFound -> Json.obj("message" -> "Address has no transaction")) |
There was a problem hiding this comment.
no txs does not mean NotFound
utolp
reviewed
Aug 29, 2019
| if(stateSettings.txTypeAccountTxIds){ | ||
| val txNum = state.txTypeAccTxLengths(TransactionType.LeaseTransaction, a) | ||
| val txIds = state.txTypeAccountTxIds(TransactionType.LeaseTransaction, a, txNum, 0) | ||
| val res = Option(txIds._2) |
utolp
reviewed
Aug 29, 2019
| val txNum = state.txTypeAccTxLengths(TransactionType.LeaseTransaction, a) | ||
| val txIds = state.txTypeAccountTxIds(TransactionType.LeaseTransaction, a, txNum, 0) | ||
| val res = Option(txIds._2) | ||
| .map(_.flatMap(state.transactionInfo) |
utolp
reviewed
Aug 29, 2019
| val txIds = state.txTypeAccountTxIds(TransactionType.LeaseTransaction, a, txNum, 0) | ||
| val res = Option(txIds._2) | ||
| .map(_.flatMap(state.transactionInfo) | ||
| .map(a => (a._1,a._2,a._2.transaction)) |
There was a problem hiding this comment.
do not copy the codes below. result of state.activeLeases() is already filtered by lease status
utolp
reviewed
Aug 29, 2019
| .filter(a => state.isLeaseActive(a._3.asInstanceOf[LeaseTransaction])) | ||
| .collect{ | ||
| case (h:Int, tx:ProcessedTransaction, lt:LeaseTransaction) | ||
| if EllipticCurve25519Proof.fromBytes(lt.proofs.proofs.head.bytes.arr).toOption.get.publicKey.address == address => |
utolp
reviewed
Aug 29, 2019
| val txNum = state.txTypeAccTxLengths(TransactionType.LeaseTransaction, a) | ||
| val txIds = state.txTypeAccountTxIds(TransactionType.LeaseTransaction, a, txNum, 0) | ||
| complete(Json.arr(JsArray(txIds._2 | ||
| .flatMap(state.transactionInfo) |
There was a problem hiding this comment.
txIds._2.flatMap(state.transactionInfo) is already implemented in txTypeAccountTransactions
utolp
reviewed
Aug 29, 2019
| .flatMap(state.transactionInfo) | ||
| .map(a => (a._1, a._2, a._2.transaction)) | ||
| .filter(a => state.isLeaseActive(a._3.asInstanceOf[LeaseTransaction])) | ||
| .map(a => (processedTxToExtendedJson(a._2) + ("height" -> JsNumber(a._1)))) |
utolp
reviewed
Aug 29, 2019
| complete(Json.arr(JsArray(txIds._2 | ||
| .flatMap(state.transactionInfo) | ||
| .map(a => (a._1, a._2, a._2.transaction)) | ||
| .filter(a => state.isLeaseActive(a._3.asInstanceOf[LeaseTransaction])) |
There was a problem hiding this comment.
call isLeaseActive in loop is not in one business transaction. need read lock here
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Details
Change implementation of getting txId
Description
In original code, transaction id is got by traversing whole state. This version use transaction type and address to get transaction id directly
Related Issue
#113
Motivation and Context
Increase performance of address api
How Has This Been Tested
Unit test has passed
Types of changes
Checklist