fixed conflicts in transaction branch

nagarajm22 · nagarajm22 · commit 2882de582e07 · 2024-01-25T17:08:43.000+08:00
diff --git a/lib/ain-ocean/src/api/response.rs b/lib/ain-ocean/src/api/response.rs
@@ -128,7 +128,9 @@ mod tests {
     fn should_next_with_value() {
         let items: Vec<Item> = vec![Item::new("0", "a"), Item::new("1", "b")];
 
-        let next = ApiPagedResponse::next(items, Some("b")).page.next;
+        let next = ApiPagedResponse::next(items, Some("b".to_string()))
+            .page
+            .next;
         assert_eq!(next, Some("b".into()));
     }
 
diff --git a/lib/ain-ocean/src/api/transactions.rs b/lib/ain-ocean/src/api/transactions.rs
@@ -27,7 +27,6 @@ async fn get_transaction(
     Ok(Json(transactions))
 }
 
-//get list of vout transaction, by passing id which contains txhash + vout_idx
 async fn get_vins(
     Query(query): Query<PaginationQuery>,
 ) -> Result<Json<ApiPagedResponse<TransactionVin>>> {

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ mod tests {`
`128`	`128`	`fn should_next_with_value() {`
`129`	`129`	`let items: Vec<Item> = vec![Item::new("0", "a"), Item::new("1", "b")];`
`130`	`130`
`131`		`- let next = ApiPagedResponse::next(items, Some("b")).page.next;`
	`131`	`+ let next = ApiPagedResponse::next(items, Some("b".to_string()))`
	`132`	`+ .page`
	`133`	`+ .next;`
`132`	`134`	`assert_eq!(next, Some("b".into()));`
`133`	`135`	`}`
`134`	`136`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ async fn get_transaction(`
`27`	`27`	`Ok(Json(transactions))`
`28`	`28`	`}`
`29`	`29`
`30`		`-//get list of vout transaction, by passing id which contains txhash + vout_idx`
`31`	`30`	`async fn get_vins(`
`32`	`31`	`Query(query): Query<PaginationQuery>,`
`33`	`32`	`) -> Result<Json<ApiPagedResponse<TransactionVin>>> {`