adds a new version to the /vaults endpoint to list cache duration #31
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
Signed-off-by: Bruno Calza <[email protected]>
brunocalza
commented
Mar 21, 2024
| @@ -70,17 +70,40 @@ pub async fn is_namespace_owner(pool: &PgPool, ns: &str, owner: Address) -> Resu | |||
| Ok(!res.is_empty()) | |||
| } | |||
|
|
|||
| /// Returns cache config | |||
| pub async fn get_cache_config(pool: &PgPool, ns: &str, rel: &str) -> Result<Option<i64>> { | |||
| /// Returns cache config from a vault | |||
There was a problem hiding this comment.
this is just a refactor
| .fetch_one(pool) | ||
| .await | ||
| .unwrap_or((None, )); | ||
| Ok(duration) | ||
| } | ||
|
|
||
| pub async fn find_cache_config_by_vaults( |
There was a problem hiding this comment.
new db method that fetches all configs at once for a list of vaults. the query is a bit complicated because of how the schema of the database is structured
| @@ -150,6 +151,82 @@ pub async fn find_vaults_by_account<E: EVMClient + 'static + std::marker::Sync>( | |||
| Ok(with_status(json(&vaults), StatusCode::OK)) | |||
| } | |||
|
|
|||
| pub async fn find_vaults_by_account_v2<E: EVMClient + 'static + std::marker::Sync>( | |||
| @@ -39,6 +39,7 @@ mod api { | |||
| ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone { | |||
| health() | |||
| .or(vaults_list(evm_client.clone())) | |||
| .or(vaults_list_v2(evm_client.clone(), db.clone())) | |||
There was a problem hiding this comment.
hooks new route
| @@ -67,6 +68,19 @@ mod api { | |||
| .and_then(routes::find_vaults_by_account) | |||
| } | |||
|
|
|||
| // GET /v2/vaults | |||
| pub fn vaults_list_v2<E: EVMClient + 'static + std::marker::Sync>( | |||
| @@ -145,6 +145,18 @@ impl TestApp { | |||
| .expect("Failed to execute request.") | |||
| } | |||
|
|
|||
| pub async fn get_vaults_v2(&self) -> Response { | |||
There was a problem hiding this comment.
test helper for v2
| @@ -37,6 +37,37 @@ async fn list_vaults() { | |||
| assert_eq!(json!(["api.test", "api.test2"]), response); | |||
| } | |||
|
|
|||
| #[tokio::test] | |||
| async fn list_vaults_v2() { | |||
There was a problem hiding this comment.
new test for v2
avichalp
reviewed
Mar 22, 2024
lib/worker/src/domain/vault.rs
Outdated
| @@ -1,7 +1,7 @@ | |||
| use regex::Regex; | |||
| use std::fmt; | |||
|
|
|||
| #[derive(Debug)] | |||
| #[derive(Debug, Clone)] | |||
There was a problem hiding this comment.
I think, if you burrow the Vault in this function: find_cache_config_by_vaults, you may not need to implement Clone here?
There was a problem hiding this comment.
thanks! yeah, that works. I still tend to just clone to solve the compiler complaint 😅
avichalp
approved these changes
Mar 22, 2024
Signed-off-by: Bruno Calza <[email protected]>
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.
Summary
This PR adds a
/v2/vaultendpoint that lists the vaults from a given account and the cache duration of that vault.We needed to add a version because the response is a breaking change.
Here's a response sample:
[ { "vault": "api50.test", "cache_duration": null }, { "vault": "api51.test", "cache_duration": 10 } ]Goes together with tablelandnetwork/basin-cli#41 and closes ENG-761