Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ keywords = ["parity", "substrate", "blockchain"]
include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]

[features]
kusama = []
default = ["kusama"]
default = []
client = ["substrate-subxt-client"]

# enable this feature to run tests which require a local dev chain node
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ A library to **sub**mit e**xt**rinsics to a [substrate](https://github.com/parit

See [examples](./examples).

If you use `#[derive(Call)]` without `#[module]` in the same module, you will get errors
complaining about an undefined method with a name starting with `with_`.

**Alternatives**

[substrate-api-client](https://github.com/scs/substrate-api-client) provides similar functionality.
Expand Down
4 changes: 4 additions & 0 deletions proc-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ decl_derive!(
///
/// Under the hood the implementation calls [submit()](../substrate_subxt/struct.Client.html#method.submit) and
/// [watch()](../substrate_subxt/struct.Client.html#method.watch) respectively.
///
/// *N.B.* You must use the `#[derive(Call)]` macro with `#[module]` in the same module or you will get errors
/// about undefined method with a name starting with `with_`.

#[proc_macro_error] call
);
fn call(s: Structure) -> TokenStream {
Expand Down
10 changes: 1 addition & 9 deletions src/frame/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,7 @@ pub trait System {
type Hashing: Hash<Output = Self::Hash>;

/// The user account identifier type for the runtime.
type AccountId: Parameter
+ Member
+ MaybeSerialize
+ Debug
+ MaybeDisplay
+ Encode
+ Decode
+ Ord
+ Default;
type AccountId: Parameter + Member + MaybeSerialize + MaybeDisplay + Ord + Default;

/// The address type. This instead of `<frame_system::Trait::Lookup as StaticLookup>::Source`.
#[module(ignore)]
Expand Down
3 changes: 0 additions & 3 deletions src/runtimes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ impl sp_runtime::BoundToRuntimeAppPublic for Grandpa {

use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;

#[cfg(feature = "kusama")]
mod validator_app {
use application_crypto::{
app_crypto,
Expand All @@ -62,11 +61,9 @@ mod validator_app {
}

/// Parachain marker struct
#[cfg(feature = "kusama")]
#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub struct Parachains;

#[cfg(feature = "kusama")]
impl sp_runtime::BoundToRuntimeAppPublic for Parachains {
type Public = validator_app::Public;
}
Expand Down