Merge pull request paritytech#161 from subspace/rename-CallObjectLoca…

…tion

Rename `CallObjectLocation` to `CallObject`

crates/pallet-feeds/src/lib.rs

@@ -150,21 +150,21 @@ mod pallet {
 
 /// Mapping to the object offset and size within an extrinsic
 #[derive(Debug)]
-pub struct CallObjectLocation {
+pub struct CallObject {
     /// Object hash
     pub hash: Sha256Hash,
-    /// Offset
+    /// Offset of object in the encoded call.
     pub offset: u32,
 }
 
 impl<T: Config> Call<T> {
-    /// Extract object location if an extrinsic corresponds to `put` call
-    pub fn extract_object_location(&self) -> Option<CallObjectLocation> {
+    /// Extract the call object if an extrinsic corresponds to `put` call
+    pub fn extract_call_object(&self) -> Option<CallObject> {
         match self {
             Self::put { data, .. } => {
                 // `FeedId` is the first field in the extrinsic. `1+` corresponds to `Call::put {}`
                 // enum variant encoding.
-                Some(CallObjectLocation {
+                Some(CallObject {
                     hash: crypto::sha256_hash(data),
                     offset: 1 + mem::size_of::<FeedId>() as u32,
                 })

crates/pallet-object-store/src/lib.rs

@@ -83,20 +83,20 @@ mod pallet {
 
 /// Mapping to the object offset and size within an extrinsic
 #[derive(Debug)]
-pub struct CallObjectLocation {
+pub struct CallObject {
     /// Object hash
     pub hash: Sha256Hash,
-    /// Offset
+    /// Offset of object in the encoded call.
     pub offset: u32,
 }
 
 impl<T: Config> Call<T> {
     /// Extract object location if an extrinsic corresponds to `put` call
-    pub fn extract_object_location(&self) -> Option<CallObjectLocation> {
+    pub fn extract_call_object(&self) -> Option<CallObject> {
         match self {
             Self::put { data } => {
                 // `1` corresponds to `Call::put {}` enum variant encoding.
-                Some(CallObjectLocation {
+                Some(CallObject {
                     hash: crypto::sha256_hash(data),
                     offset: 1,
                 })

crates/subspace-core-primitives/src/objects.rs

@@ -41,7 +41,7 @@ pub enum BlockObject {
     V0 {
         /// Object hash
         hash: Sha256Hash,
-        /// Offset of the object.
+        /// Offset of object in the encoded block.
         offset: u32,
     },
 }
@@ -54,7 +54,7 @@ impl BlockObject {
         }
     }
 
-    /// Offset of the object.
+    /// Offset of object in the encoded block.
     pub fn offset(&self) -> u32 {
         match self {
             Self::V0 { offset, .. } => *offset,

crates/subspace-runtime/src/lib.rs

@@ -414,10 +414,10 @@ fn extract_feeds_block_object_mapping(
     objects: &mut Vec<BlockObject>,
     call: &pallet_feeds::Call<Runtime>,
 ) {
-    if let Some(call_object_location) = call.extract_object_location() {
+    if let Some(call_object) = call.extract_call_object() {
         objects.push(BlockObject::V0 {
-            hash: call_object_location.hash,
-            offset: base_offset + call_object_location.offset,
+            hash: call_object.hash,
+            offset: base_offset + call_object.offset,
         });
     }
 }
@@ -427,10 +427,10 @@ fn extract_object_store_block_object_mapping(
     objects: &mut Vec<BlockObject>,
     call: &pallet_object_store::Call<Runtime>,
 ) {
-    if let Some(call_object_location) = call.extract_object_location() {
+    if let Some(call_object) = call.extract_call_object() {
         objects.push(BlockObject::V0 {
-            hash: call_object_location.hash,
-            offset: base_offset + call_object_location.offset,
+            hash: call_object.hash,
+            offset: base_offset + call_object.offset,
         });
     }
 }