Merge ad20d40 into 53520c1

cli/template/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 ink_core = { git = "https://github.com/paritytech/ink", package = "ink_core", default-features = false }
 ink_model = { git = "https://github.com/paritytech/ink", package = "ink_model", default-features = false }
 ink_lang = { git = "https://github.com/paritytech/ink", package = "ink_lang", default-features = false }
-parity-codec = { version = "4.1", default-features = false, features = ["derive"] }
+parity-scale-codec = { version = "1.0", default-features = false, features = ["derive"] }
 
 [lib]
 name = "{{name}}"
@@ -20,7 +20,7 @@ std = [
     "ink_core/std",
     "ink_model/std",
     "ink_lang/std",
-    "parity-codec/std",
+    "parity-scale-codec/std",
 ]
 test-env = [
     "std",

core/Cargo.toml

@@ -20,13 +20,13 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
 [dependencies]
 ink_alloc = { path = "../alloc/", default-features = false }
 ink_utils = { path = "../utils/", default-features = false }
-parity-codec = { version = "4.1", default-features = false, features = ["derive", "full"] }
+parity-scale-codec = { version = "1.0", default-features = false, features = ["derive", "full"] }
 
 [features]
 default = ["std"]
 test-env = ["std"]
 std = [
     "ink_alloc/std",
     "ink_utils/std",
-    "parity-codec/std",
+    "parity-scale-codec/std",
 ]

core/src/env/api.rs

@@ -26,7 +26,7 @@ use crate::{
     memory::vec::Vec,
     storage::Key,
 };
-use parity_codec::Encode;
+use parity_scale_codec::Encode;
 
 /// Stores the given value under the specified key in the contract storage.
 ///

core/src/env/srml/srml_only/impls.rs

@@ -25,7 +25,7 @@ use crate::{
     storage::Key,
 };
 use core::marker::PhantomData;
-use parity_codec::Decode;
+use parity_scale_codec::Decode;
 
 /// Load the contents of the scratch buffer
 fn read_scratch_buffer() -> Vec<u8> {
@@ -95,9 +95,6 @@ macro_rules! impl_getters_for_srml_env {
             fn $name() -> $ret_type {
                 unsafe { sys::$ext_name() };
                 Decode::decode(&mut &read_scratch_buffer()[..])
-                    .ok_or(concat!(
-                        stringify!($name), " received an incorrectly sized buffer from SRML"
-                    ))
                     .expect(concat!(
                         stringify!($name), " expects to receive a correctly sized buffer"
                     ))

core/src/env/srml/types.rs

@@ -24,7 +24,7 @@ use crate::{
     impl_empty_flush_for,
     storage::Flush,
 };
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };
@@ -44,14 +44,14 @@ pub enum DefaultSrmlTypes {}
 /// environment, in order to keep the code size small.
 #[cfg_attr(feature = "test-env", derive(Debug, Clone, PartialEq, Eq))]
 pub enum Call {}
-impl parity_codec::Encode for Call {}
+impl parity_scale_codec::Encode for Call {}
 
 /// This implementation is only to satisfy the Decode constraint in the
 /// test environment. Since Call cannot be constructed then just return
 /// None, but this should never be called.
 #[cfg(feature = "test-env")]
-impl parity_codec::Decode for Call {
-    fn decode<I: parity_codec::Input>(_value: &mut I) -> Option<Self> {
+impl parity_scale_codec::Decode for Call {
+    fn decode<I: parity_scale_codec::Input>(_value: &mut I) -> Option<Self> {
         None
     }
 }

core/src/env/test_env.rs

@@ -27,7 +27,7 @@ use core::cell::{
     Cell,
     RefCell,
 };
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };

core/src/env/traits.rs

@@ -18,7 +18,7 @@ use crate::{
     memory::vec::Vec,
     storage::Key,
 };
-use parity_codec::Codec;
+use parity_scale_codec::Codec;
 
 #[cfg(not(feature = "test-env"))]
 /// The environmental types usable by contracts defined with ink!.
@@ -34,7 +34,7 @@ pub trait EnvTypes {
     /// The type of block number.
     type BlockNumber: Codec + Clone + PartialEq + Eq;
     /// The type of a call into the runtime
-    type Call: parity_codec::Encode;
+    type Call: parity_scale_codec::Encode;
 }
 
 #[cfg(feature = "test-env")]

core/src/storage/alloc/cc_alloc.rs

@@ -21,7 +21,7 @@ use crate::storage::{
     Key,
 };
 
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };

core/src/storage/cell/raw_cell.rs

@@ -27,7 +27,7 @@ use crate::{
     },
 };
 
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };

core/src/storage/cell/sync_cell.rs

@@ -286,14 +286,16 @@ impl<T> Cache<T> {
     }
 }
 
-impl<T> parity_codec::Encode for SyncCell<T> {
-    fn encode_to<W: parity_codec::Output>(&self, dest: &mut W) {
+impl<T> parity_scale_codec::Encode for SyncCell<T> {
+    fn encode_to<W: parity_scale_codec::Output>(&self, dest: &mut W) {
         self.cell.encode_to(dest)
     }
 }
 
-impl<T> parity_codec::Decode for SyncCell<T> {
-    fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
+impl<T> parity_scale_codec::Decode for SyncCell<T> {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
         TypedCell::decode(input).map(|typed_cell| {
             Self {
                 cell: typed_cell,
@@ -305,7 +307,7 @@ impl<T> parity_codec::Decode for SyncCell<T> {
 
 impl<T> Flush for SyncCell<T>
 where
-    T: parity_codec::Encode + Flush,
+    T: parity_scale_codec::Encode + Flush,
 {
     fn flush(&mut self) {
         if self.cache.is_dirty() {
@@ -343,7 +345,7 @@ impl<T> SyncCell<T> {
 
 impl<T> SyncCell<T>
 where
-    T: parity_codec::Decode,
+    T: parity_scale_codec::Decode,
 {
     /// Returns an immutable reference to the value of the cell.
     pub fn get(&self) -> Option<&T> {
@@ -357,7 +359,7 @@ where
 
 impl<T> SyncCell<T>
 where
-    T: parity_codec::Encode,
+    T: parity_scale_codec::Encode,
 {
     /// Sets the value of the cell.
     pub fn set(&mut self, val: T) {
@@ -368,7 +370,7 @@ where
 
 impl<T> SyncCell<T>
 where
-    T: parity_codec::Codec,
+    T: parity_scale_codec::Codec,
 {
     /// Returns a mutable reference to the value of the cell.
     pub fn get_mut(&mut self) -> Option<&mut T> {

core/src/storage/cell/typed_cell.rs

@@ -41,14 +41,16 @@ pub struct TypedCell<T> {
     non_clone: NonCloneMarker<T>,
 }
 
-impl<T> parity_codec::Encode for TypedCell<T> {
-    fn encode_to<W: parity_codec::Output>(&self, dest: &mut W) {
+impl<T> parity_scale_codec::Encode for TypedCell<T> {
+    fn encode_to<W: parity_scale_codec::Output>(&self, dest: &mut W) {
         self.cell.encode_to(dest)
     }
 }
 
-impl<T> parity_codec::Decode for TypedCell<T> {
-    fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
+impl<T> parity_scale_codec::Decode for TypedCell<T> {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
         RawCell::decode(input).map(|raw_cell| {
             Self {
                 cell: raw_cell,
@@ -79,19 +81,22 @@ impl<T> TypedCell<T> {
 
 impl<T> TypedCell<T>
 where
-    T: parity_codec::Decode,
+    T: parity_scale_codec::Decode,
 {
     /// Loads the value stored in the cell if any.
     pub fn load(&self) -> Option<T> {
-        self.cell
-            .load()
-            .and_then(|bytes| T::decode(&mut &bytes[..]))
+        self.cell.load().map(|bytes| {
+            T::decode(&mut &bytes[..]).expect(
+                "[ink_core::TypedCell::load] Error: \
+                 failed upon decoding",
+            )
+        })
     }
 }
 
 impl<T> TypedCell<T>
 where
-    T: parity_codec::Encode,
+    T: parity_scale_codec::Encode,
 {
     /// Stores the value into the cell.
     pub fn store(&mut self, val: &T) {

core/src/storage/chunk/raw_chunk.rs

@@ -78,14 +78,16 @@ impl RawChunkCell<'_> {
     }
 }
 
-impl parity_codec::Encode for RawChunk {
-    fn encode_to<W: parity_codec::Output>(&self, dest: &mut W) {
+impl parity_scale_codec::Encode for RawChunk {
+    fn encode_to<W: parity_scale_codec::Output>(&self, dest: &mut W) {
         self.key.encode_to(dest)
     }
 }
 
-impl parity_codec::Decode for RawChunk {
-    fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
+impl parity_scale_codec::Decode for RawChunk {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
         Key::decode(input).map(|key| unsafe { Self::new_unchecked(key) })
     }
 }

core/src/storage/chunk/sync_chunk/chunk.rs

@@ -47,7 +47,7 @@ pub struct SyncChunk<T> {
 
 impl<T> Flush for SyncChunk<T>
 where
-    T: parity_codec::Encode + Flush,
+    T: parity_scale_codec::Encode + Flush,
 {
     fn flush(&mut self) {
         for (n, dirty_val) in self.cache.iter_dirty() {
@@ -63,14 +63,16 @@ where
     }
 }
 
-impl<T> parity_codec::Encode for SyncChunk<T> {
-    fn encode_to<W: parity_codec::Output>(&self, dest: &mut W) {
+impl<T> parity_scale_codec::Encode for SyncChunk<T> {
+    fn encode_to<W: parity_scale_codec::Output>(&self, dest: &mut W) {
         self.chunk.encode_to(dest)
     }
 }
 
-impl<T> parity_codec::Decode for SyncChunk<T> {
-    fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
+impl<T> parity_scale_codec::Decode for SyncChunk<T> {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
         TypedChunk::decode(input).map(|typed_chunk| {
             Self {
                 chunk: typed_chunk,
@@ -111,7 +113,7 @@ impl<T> SyncChunk<T> {
 
 impl<T> SyncChunk<T>
 where
-    T: parity_codec::Decode,
+    T: parity_scale_codec::Decode,
 {
     /// Returns the value of the `n`-th cell if any.
     #[must_use]
@@ -152,7 +154,7 @@ where
 
 impl<T> SyncChunk<T>
 where
-    T: parity_codec::Encode,
+    T: parity_scale_codec::Encode,
 {
     /// Sets the value of the `n`-th cell.
     pub fn set(&mut self, n: u32, val: T) {
@@ -162,7 +164,7 @@ where
 
 impl<T> SyncChunk<T>
 where
-    T: parity_codec::Codec,
+    T: parity_scale_codec::Codec,
 {
     /// Replaces the value of the `n`-th cell and returns its old value if any.
     ///

core/src/storage/chunk/typed_chunk.rs

@@ -87,22 +87,24 @@ impl<'a, T> TypedChunkCell<'a, T> {
 
 impl<'a, T> TypedChunkCell<'a, T>
 where
-    T: parity_codec::Encode,
+    T: parity_scale_codec::Encode,
 {
     /// Stores the value into the cell.
     pub fn store(&mut self, val: &T) {
         self.cell.store(&T::encode(val))
     }
 }
 
-impl<T> parity_codec::Encode for TypedChunk<T> {
-    fn encode_to<W: parity_codec::Output>(&self, dest: &mut W) {
+impl<T> parity_scale_codec::Encode for TypedChunk<T> {
+    fn encode_to<W: parity_scale_codec::Output>(&self, dest: &mut W) {
         self.chunk.encode_to(dest)
     }
 }
 
-impl<T> parity_codec::Decode for TypedChunk<T> {
-    fn decode<I: parity_codec::Input>(input: &mut I) -> Option<Self> {
+impl<T> parity_scale_codec::Decode for TypedChunk<T> {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
         RawChunk::decode(input).map(|raw_chunk| {
             Self {
                 chunk: raw_chunk,
@@ -136,7 +138,7 @@ impl<T> TypedChunk<T> {
 
 impl<T> TypedChunk<T>
 where
-    T: parity_codec::Decode,
+    T: parity_scale_codec::Decode,
 {
     /// Loads the value stored in the `n`-th cell if any.
     ///
@@ -157,7 +159,7 @@ where
 
 impl<T> TypedChunk<T>
 where
-    T: parity_codec::Encode,
+    T: parity_scale_codec::Encode,
 {
     /// Stores the value into the `n`-th cell.
     pub fn store(&mut self, n: u32, val: &T) {

core/src/storage/collections/bitvec/block.rs

@@ -16,7 +16,7 @@
 
 use super::BitPack;
 use crate::storage::Flush;
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };

core/src/storage/collections/bitvec/pack.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ink!.  If not, see <http://www.gnu.org/licenses/>.
 
-use parity_codec::{
+use parity_scale_codec::{
     Decode,
     Encode,
 };