Make get_transactions_by_tracker return an array of transactions

Author: Juhyung Park

core/src/client/client.rs

@@ -392,7 +392,8 @@ impl AssetClient for Client {
             Some(_) => {}
         }
 
-        let localized = self.transaction_by_tracker(&tracker).expect("There is a successful transaction");
+        let localized =
+            self.transactions_by_tracker(&tracker).last().cloned().expect("There is a successful transaction");
         let transaction = if let Some(tx) = Option::<ShardTransaction>::from(localized.action.clone()) {
             tx
         } else {
@@ -704,10 +705,10 @@ impl BlockChainClient for Client {
         self.transaction_address(id).and_then(|address| chain.invoice(&address))
     }
 
-    fn transaction_by_tracker(&self, tracker: &H256) -> Option<LocalizedTransaction> {
+    fn transactions_by_tracker(&self, tracker: &H256) -> Vec<LocalizedTransaction> {
         let chain = self.block_chain();
-        let address = self.transaction_addresses(tracker)?;
-        address.into_iter().map(Into::into).map(|address| chain.transaction(&address)).next()?
+        let address = self.transaction_addresses(tracker).unwrap_or_default();
+        address.into_iter().map(Into::into).filter_map(|address| chain.transaction(&address)).collect()
     }
 
     fn invoices_by_tracker(&self, tracker: &H256) -> Vec<Invoice> {

core/src/client/mod.rs

@@ -263,7 +263,7 @@ pub trait BlockChainClient:
     fn invoice(&self, id: &TransactionId) -> Option<Invoice>;
 
     /// Get the transaction with given tracker.
-    fn transaction_by_tracker(&self, tracker: &H256) -> Option<LocalizedTransaction>;
+    fn transactions_by_tracker(&self, tracker: &H256) -> Vec<LocalizedTransaction>;
 
     fn invoices_by_tracker(&self, tracker: &H256) -> Vec<Invoice>;
 }

core/src/client/test_client.rs

@@ -547,7 +547,7 @@ impl BlockChainClient for TestBlockChainClient {
         unimplemented!();
     }
 
-    fn transaction_by_tracker(&self, _: &H256) -> Option<LocalizedTransaction> {
+    fn transactions_by_tracker(&self, _: &H256) -> Vec<LocalizedTransaction> {
         unimplemented!();
     }
 

rpc/src/v1/impls/chain.rs

@@ -105,12 +105,17 @@ where
         Ok(self.client.invoice(&transaction_hash.into()).map(|invoice| invoice.to_bool()))
     }
 
-    fn get_transaction_by_tracker(&self, tracker: H256) -> Result<Option<Transaction>> {
-        Ok(self.client.transaction_by_tracker(&tracker).map(|tx| {
-            let transaction_id = tx.hash().into();
-            let invoice = self.client.invoice(&transaction_id).expect("Invoice must exist when transaction exists");
-            Transaction::from(tx, invoice.to_bool())
-        }))
+    fn get_transactions_by_tracker(&self, tracker: H256) -> Result<Vec<Transaction>> {
+        Ok(self
+            .client
+            .transactions_by_tracker(&tracker)
+            .into_iter()
+            .map(|tx| {
+                let transaction_id = tx.hash().into();
+                let invoice = self.client.invoice(&transaction_id).expect("Invoice must exist when transaction exists");
+                Transaction::from(tx, invoice.to_bool())
+            })
+            .collect())
     }
 
     fn get_transaction_results_by_tracker(&self, tracker: H256) -> Result<Vec<bool>> {

rpc/src/v1/traits/chain.rs

@@ -42,8 +42,8 @@ build_rpc_trait! {
         fn get_transaction_result(&self, H256) -> Result<Option<bool>>;
 
         /// Gets transaction with given transaction tracker.
-        # [rpc(name = "chain_getTransactionByTracker")]
-        fn get_transaction_by_tracker(&self, H256) -> Result<Option<Transaction>>;
+        # [rpc(name = "chain_getTransactionsByTracker")]
+        fn get_transactions_by_tracker(&self, H256) -> Result<Vec<Transaction>>;
 
         /// Gets transaction results with given transaction tracker.
         # [rpc(name = "chain_getTransactionResultsByTracker")]

spec/JSON-RPC.md

@@ -289,7 +289,7 @@ When `Transaction` is included in any response, there will be an additional fiel
  * [chain_sendSignedTransaction](#chain_sendsignedtransaction)
  * [chain_getTransaction](#chain_gettransaction)
  * [chain_getTransactionResult](#chain_gettransactionresult)
- * [chain_getTransactionByTracker](#chain_gettransactionbytracker)
+ * [chain_getTransactionsByTracker](#chain_gettransactionsbytracker)
  * [chain_getTransactionResultsByTracker](#chain_getTransactionResultsByTracker)
  * [chain_getAssetSchemeByTracker](#chain_getassetschemebytracker)
  * [chain_getAssetSchemeByType](#chain_getassetschemebytype)
@@ -817,30 +817,30 @@ Errors: `Invalid Params`
 
 [Back to **List of methods**](#list-of-methods)
 
-## chain_getTransactionByTracker
-Gets a transaction with the given tracker.
+## chain_getTransactionsByTracker
+Gets transactions with the given tracker.
 
 ### Params
  1. tracker - `H256`
 
 ### Returns
-`null` | `Transaction`
+`Transaction[]`
 
 Errors: `Invalid Params`
 
 ### Request Example
 ```
   curl \
     -H 'Content-Type: application/json' \
-    -d '{"jsonrpc": "2.0", "method": "chain_getTransactionByTracker", "params": ["0x24df02abcd4e984e90253dc344e89b8431bbb319c66643bfef566dfdf46ec6bc"], "id": null}' \
+    -d '{"jsonrpc": "2.0", "method": "chain_getTransactionsByTracker", "params": ["0x24df02abcd4e984e90253dc344e89b8431bbb319c66643bfef566dfdf46ec6bc"], "id": null}' \
     localhost:8080
 ```
 
 ### Response Example
 ```
 {
     "jsonrpc": "2.0",
-    "result": {
+    "result": [{
         "action": {
           "type":"pay",
           "amount":"0xa",
@@ -855,7 +855,7 @@ Errors: `Invalid Params`
         "seq": 4,
         "transactionIndex": 0,
         "sig":"0x291d932e55162407eb01915923d68cf78df4815a25fc6033488b644bda44b02251123feac3a3c56a399a2b32331599fd50b7a39ec2c1a2325e37f383c6aeedc301"
-    }
+    }],
     "id": null,
 }
 ```

test/package.json

@@ -44,7 +44,7 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "codechain-primitives": "^0.4.8",
-    "codechain-sdk": "^0.6.0",
+    "codechain-sdk": "https://github.com/majecty/codechain-sdk-js-1.git#f/get-transactions-by-tracker-build",
     "crypto": "^1.0.1",
     "dgram": "^1.0.1",
     "elliptic": "^6.4.1",

test/src/e2e/chain.test.ts

@@ -24,6 +24,7 @@ import {
     H256,
     H512,
     MintAsset,
+    SignedTransaction,
     U64
 } from "codechain-sdk/lib/core/classes";
 import "mocha";
@@ -240,15 +241,15 @@ describe("chain", function() {
             await node.sdk.rpc.chain.sendSignedTransaction(signed);
         });
 
-        it("getTransactionByTracker", async function() {
+        it("getTransactionsByTracker", async function() {
             expect(
-                ((await node.sdk.rpc.chain.getTransactionByTracker(
+                ((await node.sdk.rpc.chain.getTransactionsByTracker(
                     tx.tracker()
-                )) as any).unsigned
-            ).to.deep.equal(tx);
+                )) as any).map((tx: SignedTransaction) => tx.unsigned)
+            ).to.deep.equal([tx]);
             expect(
-                await node.sdk.rpc.chain.getTransactionByTracker(invalidH256)
-            ).to.be.null;
+                await node.sdk.rpc.chain.getTransactionsByTracker(invalidH256)
+            ).to.deep.equal([]);
         });
 
         it("getTransactionResultsByTracker", async function() {

test/yarn.lock

@@ -554,10 +554,9 @@ codechain-primitives@^0.4.7, codechain-primitives@^0.4.8:
     ripemd160 "^2.0.2"
     rlp "^2.1.0"
 
-codechain-sdk@^0.6.0:
+"codechain-sdk@https://github.com/majecty/codechain-sdk-js-1.git#f/get-transactions-by-tracker-build":
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/codechain-sdk/-/codechain-sdk-0.6.0.tgz#9bbcac07ee5004221b0b0d5910cfb6e98e40ee77"
-  integrity sha512-Fo2BnR39AHMArhlxL/jESoCnbipvHUVFrfc2OuI2gdCokI5+4Y1g+X+FSW6lVc4UjnaNP5MZ/upvNgMPfuXxNQ==
+  resolved "https://github.com/majecty/codechain-sdk-js-1.git#d26d2ffe85c1ec2b27f0e16457fd0719b775f6ed"
   dependencies:
     buffer "5.1.0"
     codechain-keystore "^0.6.0"