Skip to content

chore: remove RPC for public credentials and remove Api suffix from runtime APIs #426

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.

Sign up for GitHub

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

Merged
ntn-x2 merged 9 commits into from
Oct 20, 2022
Merged

chore: remove RPC for public credentials and remove Api suffix from runtime APIs #426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b19bb97
Rename public credentials runtime API
ntn-x2 Oct 19, 2022
db95807
Rename public credentials RPC interface
ntn-x2 Oct 19, 2022
3232d48
Rename credential filter
ntn-x2 Oct 19, 2022
52aeb5c
Accept raw asset DID for runtime API
ntn-x2 Oct 19, 2022
e06f866
Mashnet node compiling
ntn-x2 Oct 19, 2022
901c033
Whole project compiling
ntn-x2 Oct 19, 2022
a1053b0
Clippy fix
ntn-x2 Oct 19, 2022
44f8e05
Minor cleanups
ntn-x2 Oct 19, 2022
9d2c21d
Add comment to runtime API functions for public credentials
ntn-x2 Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename credential filter
  • Loading branch information
@ntn-x2
ntn-x2 committed Oct 19, 2022
commit 3232d485bcbd559a8ebb87358864ed515df08fa8
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions nodes/common/src/public_credentials.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@

use serde::{Deserialize, Serialize};

use kilt_support::deposit::Deposit;
use kilt_support::{deposit::Deposit, traits::ItemFilter};
use public_credentials::CredentialEntry;

use public_credentials_rpc::PublicCredentialsFilter;

#[derive(Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
/// Thin wrapper around a runtime credential entry as specified in the
/// `public-credentials` pallet. This wrapper implements all the
/// (de-)serialization logic.
Expand Down Expand Up @@ -68,7 +67,7 @@ pub enum PublicCredentialFilter<CTypeHash, Attester> {
}

impl<CTypeHash, Attester, BlockNumber, AccountId, Balance, AuthorizationId>
PublicCredentialsFilter<CredentialEntry<CTypeHash, Attester, BlockNumber, AccountId, Balance, AuthorizationId>>
ItemFilter<CredentialEntry<CTypeHash, Attester, BlockNumber, AccountId, Balance, AuthorizationId>>
for PublicCredentialFilter<CTypeHash, Attester>
where
CTypeHash: Eq,
Expand Down
1 change: 1 addition & 0 deletions rpc/public-credentials/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ sp-blockchain = {git = "https://github.com/paritytech/substrate", default-featur
sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.29"}

# Internal runtime dependencies
kilt-support = {path = "../../support"}
public-credentials-runtime-api = {version = "1.8.0", path = "./runtime-api"}

[features]
Expand Down
8 changes: 2 additions & 6 deletions rpc/public-credentials/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ use sp_api::ProvideRuntimeApi;
use sp_blockchain::HeaderBackend;
use sp_runtime::{generic::BlockId, traits::Block as BlockT};

/// Filter that can be used after the credentials for a given subject have been
/// retrieved from the blockchain state.
pub trait PublicCredentialsFilter<Credential> {
fn should_include(&self, credential: &Credential) -> bool;
}
use kilt_support::traits::ItemFilter;

#[rpc(client, server, namespace = "publicCredentials")]
pub trait PublicCredentialsApi<BlockHash, OuterSubjectId, OuterCredentialId, OuterCredentialEntry, CredentialFilter> {
Expand Down Expand Up @@ -161,7 +157,7 @@ impl<
CredentialId: Codec + Send + Sync + 'static + TryFrom<OuterCredentialId> + Into<OuterCredentialId>,
CredentialEntry: Codec + Send + Sync + 'static,
OuterCredentialEntry: Send + Sync + 'static + From<CredentialEntry>,
CredentialFilter: Send + Sync + 'static + PublicCredentialsFilter<CredentialEntry>,
CredentialFilter: Send + Sync + 'static + ItemFilter<CredentialEntry>,
{
fn get_credential(
&self,
Expand Down
5 changes: 5 additions & 0 deletions support/src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,8 @@ pub trait GenerateBenchmarkOrigin<OuterOrigin, AccountId, SubjectId> {
pub trait GetWorstCase {
fn worst_case() -> Self;
}

/// Generic filter.
pub trait ItemFilter<Item> {
fn should_include(&self, credential: &Item) -> bool;
}
Comment on lines +80 to +82
Copy link
Contributor

@weichweich weichweich Oct 20, 2022

Choose a reason for hiding this comment

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

there is a similar trait in Frame support(?).

Copy link
Contributor

@wischli wischli Oct 20, 2022

Choose a reason for hiding this comment

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

Are you talking about InstanceFilter ?

Copy link
Contributor Author

@ntn-x2 ntn-x2 Oct 20, 2022

Choose a reason for hiding this comment

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

Yes, but in the last conversation we had (#378 (comment))
we agreed we don't need any superset logic, so I would rather not use that. I would be happy to use any other trait that would work, otherwise we can keep it as it is, and get rid of it in the future if needed.