Moving from App to Account terminology - Part 13

crates/codec/src/api/json/deploy.rs

@@ -4,7 +4,7 @@ use crate::api::builder::TemplateBuilder;
 use crate::api::json::{self, JsonError};
 use crate::template;
 
-use svm_layout::{Id, Layout, LayoutBuilder};
+use svm_layout::{FixedLayoutBuilder, Id, Layout};
 use svm_types::{CodeSection, CtorsSection, DataSection, HeaderSection};
 
 ///
@@ -71,7 +71,7 @@ fn to_data_layout(blob: Vec<u8>) -> Result<Layout, JsonError> {
         .collect();
 
     // Note: `LayoutBuilder` assume that the `first var id` is zero
-    let mut builder = LayoutBuilder::with_capacity(data.len());
+    let mut builder = FixedLayoutBuilder::with_capacity(data.len());
 
     builder.set_first(Id(0));
     builder.extend_from_slice(&data);

crates/codec/src/section/sections/data.rs

@@ -45,7 +45,7 @@
 
 use std::io::Cursor;
 
-use svm_layout::{Id, Layout, LayoutBuilder, LayoutKind, RawVar};
+use svm_layout::{FixedLayoutBuilder, Id, Layout, LayoutKind, RawVar};
 use svm_types::DataSection;
 
 use crate::section::{SectionDecoder, SectionEncoder};
@@ -124,7 +124,7 @@ fn decode_layout(cursor: &mut Cursor<&[u8]>) -> Result<Layout, ParseError> {
                 Ok(var_count) => {
                     let var_count = var_count as usize;
 
-                    let mut builder = LayoutBuilder::with_capacity(var_count);
+                    let mut builder = FixedLayoutBuilder::with_capacity(var_count);
 
                     if var_count > 0 {
                         // `First Var Id`

crates/layout/src/builder.rs

@@ -1,22 +1,20 @@
 use crate::{FixedLayout, Id, RawVar};
 
 /// Specifies the fixed-sized variables
-pub struct LayoutBuilder {
+pub struct FixedLayoutBuilder {
     first: Option<Id>,
-
     vars: Vec<(u32, u32)>,
-
     next_offset: u32,
 }
 
-impl Default for LayoutBuilder {
+impl Default for FixedLayoutBuilder {
     fn default() -> Self {
         Self::new()
     }
 }
 
-/// `LayoutBuilder` represents the fixed-sized variables (storage) of an application.
-impl LayoutBuilder {
+/// Builds [`FixedLayout`].
+impl FixedLayoutBuilder {
     /// New builder
     pub fn new() -> Self {
         Self::with_capacity(0)
@@ -61,9 +59,7 @@ impl LayoutBuilder {
     /// The starting offset is right after where the previous variable ended.
     pub fn push(&mut self, len: u32) {
         let offset = self.next_offset;
-
         self.vars.push((offset, len));
-
         self.next_offset += len;
     }
 

crates/layout/src/fixed.rs

@@ -1,4 +1,4 @@
-use crate::{Id, LayoutBuilder, RawVar};
+use crate::{FixedLayoutBuilder, Id, RawVar};
 
 /// In-memory representation of a program's fixed-sized storage variables.
 #[derive(Debug, PartialEq, Clone)]
@@ -97,7 +97,7 @@ impl From<&[u32]> for FixedLayout {
     fn from(slice: &[u32]) -> Self {
         let len = slice.len();
 
-        let mut builder = LayoutBuilder::with_capacity(len);
+        let mut builder = FixedLayoutBuilder::with_capacity(len);
 
         if len > 0 {
             builder.set_first(Id(0));
@@ -161,7 +161,7 @@ mod tests {
 
     #[test]
     fn layout_new() {
-        let mut builder = LayoutBuilder::with_capacity(2);
+        let mut builder = FixedLayoutBuilder::with_capacity(2);
 
         builder.set_first(Id(3));
         builder.push(10);
@@ -185,7 +185,7 @@ mod tests {
 
     #[test]
     fn layout_extend_from_slice() {
-        let mut builder = LayoutBuilder::with_capacity(2);
+        let mut builder = FixedLayoutBuilder::with_capacity(2);
 
         builder.set_first(Id(4));
         builder.push(10);
@@ -203,7 +203,7 @@ mod tests {
 
     #[test]
     fn layout_iter() {
-        let mut builder = LayoutBuilder::with_capacity(2);
+        let mut builder = FixedLayoutBuilder::with_capacity(2);
 
         builder.set_first(Id(1));
         builder.push(10);

crates/layout/src/lib.rs

@@ -9,7 +9,7 @@ mod builder;
 mod fixed;
 mod var;
 
-pub use builder::LayoutBuilder;
+pub use builder::FixedLayoutBuilder;
 pub use fixed::FixedLayout;
 pub use var::{Id, Primitive, RawVar, SymbolicVar, Type};