Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Bump substrate, versions. #538

Merged
gavofyork merged 3 commits into from
Nov 5, 2019
Merged

Bump substrate, versions. #538

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b43852
Bump substrate, versions.
gavofyork Nov 5, 2019
5b52f3c
Build fix
gavofyork Nov 5, 2019
4e4784c
Bump rpc deps (#537)
kianenigma Nov 5, 2019
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
Bump rpc deps (#537) 
* Update to latest sub

* Revert branch update

* Update.

* Update tests.

* Ignore warnings in tests.
  • Loading branch information
@kianenigma @gavofyork
kianenigma authored and gavofyork committed Nov 5, 2019
commit 4e4784ccba075fd69cfc1bbaf5d1d37b65926842
15 changes: 1 addition & 14 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.

2 changes: 1 addition & 1 deletion rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2018"

[dependencies]
client = { package = "substrate-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
jsonrpc-core = "13.2.0"
jsonrpc-core = "14.0.3"
polkadot-primitives = { path = "../primitives" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
substrate-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
Expand Down
8 changes: 6 additions & 2 deletions runtime/src/claims.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use serde::{self, Serialize, Deserialize, Serializer, Deserializer};
#[cfg(feature = "std")]
use sr_primitives::traits::Zero;
use sr_primitives::{
weights::SimpleDispatchInfo, traits::ValidateUnsigned,
weights::SimpleDispatchInfo,
transaction_validity::{
TransactionLongevity, TransactionValidity, ValidTransaction, InvalidTransaction
},
Expand Down Expand Up @@ -191,7 +191,8 @@ impl<T: Trait> Module<T> {
}
}

impl<T: Trait> ValidateUnsigned for Module<T> {
#[allow(deprecated)] // Allow `ValidateUnsigned`
impl<T: Trait> sr_primitives::traits::ValidateUnsigned for Module<T> {
type Call = Call<T>;

fn validate_unsigned(call: &Self::Call) -> TransactionValidity {
Expand Down Expand Up @@ -425,6 +426,9 @@ mod tests {

#[test]
fn validate_unsigned_works() {
#![allow(deprecated)] // Allow `ValidateUnsigned`
use sr_primitives::traits::ValidateUnsigned;

new_test_ext().execute_with(|| {
assert_eq!(
<Module<Test>>::validate_unsigned(&Call::claim(1, alice_sig(&1u64.encode()))),
Expand Down