mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-15 08:01:09 +00:00
Update to parity-scale-codec (#3232)
* WIP: update codec * WIP * compiling * WIP * rename parity-scale-codec to codec * WIP * fix * remove old comments * use published crates * fix expected error msg * bump version * fmt and fix * remove old comment * fix wrong decoding impl * implement encode like for structures * undo removal of old pending changes * trailingzeroinput * Apply suggestions from code review Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com> * update codec * fmt * version is 1.0.0 * show more error * fmt
This commit is contained in:
committed by
Bastian Köcher
parent
a0d442333f
commit
4ed67e03a4
@@ -6,7 +6,7 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0", optional = true, features = ["derive"] }
|
||||
codec = { package = "parity-codec", version = "4.1.1", default-features = false, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
srml-metadata = { path = "../metadata", default-features = false }
|
||||
sr-std = { path = "../../core/sr-std", default-features = false }
|
||||
runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
|
||||
|
||||
@@ -208,7 +208,7 @@ pub trait StorageValue<T: codec::Codec> {
|
||||
let new_val = <T as codec::EncodeAppend>::append(
|
||||
storage.get_raw(Self::key()).unwrap_or_default(),
|
||||
items,
|
||||
).ok_or_else(|| "Could not append given item")?;
|
||||
).map_err(|_| "Could not append given item")?;
|
||||
storage.put_raw(Self::key(), &new_val);
|
||||
Ok(())
|
||||
}
|
||||
@@ -286,7 +286,7 @@ pub trait AppendableStorageMap<K: codec::Codec, V: codec::Codec>: StorageMap<K,
|
||||
let new_val = <V as codec::EncodeAppend>::append(
|
||||
storage.get_raw(&k[..]).unwrap_or_default(),
|
||||
items,
|
||||
).ok_or_else(|| "Could not append given item")?;
|
||||
).map_err(|_| "Could not append given item")?;
|
||||
storage.put_raw(&k[..], &new_val);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ pub trait StorageDoubleMap<K1: codec::Encode, K2: codec::Encode, V: codec::Codec
|
||||
let new_val = <V as codec::EncodeAppend>::append(
|
||||
storage.get_raw(&key).unwrap_or_default(),
|
||||
items,
|
||||
).ok_or_else(|| "Could not append given item")?;
|
||||
).map_err(|_| "Could not append given item")?;
|
||||
storage.put_raw(&key, &new_val);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0", default-features = false, features = ["derive"] }
|
||||
parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] }
|
||||
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
|
||||
runtime_io = { package = "sr-io", path = "../../../core/sr-io", default-features = false }
|
||||
srml-support = { version = "2", path = "../", default-features = false }
|
||||
inherents = { package = "substrate-inherents", path = "../../../core/inherents", default-features = false }
|
||||
@@ -18,7 +18,7 @@ pretty_assertions = "0.6.1"
|
||||
default = ["std"]
|
||||
std = [
|
||||
"serde/std",
|
||||
"parity-codec/std",
|
||||
"codec/std",
|
||||
"runtime_io/std",
|
||||
"srml-support/std",
|
||||
"inherents/std",
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
use runtime_io::{with_externalities, Blake2Hasher};
|
||||
use srml_support::{StorageValue, StorageMap, StorageDoubleMap};
|
||||
use srml_support::storage::unhashed;
|
||||
use parity_codec::{Encode, Decode};
|
||||
use codec::{Encode, Decode};
|
||||
|
||||
pub trait Trait {
|
||||
type Origin;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
pub trait Trait {
|
||||
type BlockNumber: parity_codec::Codec + Default;
|
||||
type BlockNumber: codec::Codec + Default;
|
||||
type Origin;
|
||||
}
|
||||
|
||||
@@ -41,4 +41,4 @@ fn init_genesis_config() {
|
||||
GenesisConfig::<Test> {
|
||||
t: Default::default(),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ mod module1 {
|
||||
type Event: From<Event<Self, I>> + Into<<Self as system::Trait>::Event>;
|
||||
type Origin: From<Origin<Self, I>>;
|
||||
type SomeParameter: Get<u32>;
|
||||
type GenericType: Default + Clone + parity_codec::Codec;
|
||||
type GenericType: Default + Clone + codec::Codec;
|
||||
}
|
||||
|
||||
srml_support::decl_module! {
|
||||
|
||||
Reference in New Issue
Block a user