Resolve comments

kommitters · Mar 16, 2023 · f5ce508 · f5ce508
1 parent 09ba36b
commit f5ce508
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 78 deletions.
diff --git a/lib/xdr/contract/sc_address_type.ex b/lib/xdr/contract/sc_address_type.ex
@@ -16,20 +16,20 @@ defmodule StellarBase.XDR.SCAddressType do
 
   defstruct [:identifier]
 
-  @spec new(code :: atom()) :: t()
-  def new(code), do: %__MODULE__{identifier: code}
+  @spec new(type :: atom()) :: t()
+  def new(type), do: %__MODULE__{identifier: type}
 
   @impl true
-  def encode_xdr(%__MODULE__{identifier: code}) do
+  def encode_xdr(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr()
   end
 
   @impl true
-  def encode_xdr!(%__MODULE__{identifier: code}) do
+  def encode_xdr!(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr!()
   end
 
@@ -38,7 +38,7 @@ defmodule StellarBase.XDR.SCAddressType do
 
   def decode_xdr(bytes, spec) do
     case XDR.Enum.decode_xdr(bytes, spec) do
-      {:ok, {%XDR.Enum{identifier: code}, rest}} -> {:ok, {new(code), rest}}
+      {:ok, {%XDR.Enum{identifier: type}, rest}} -> {:ok, {new(type), rest}}
       error -> error
     end
   end
@@ -47,7 +47,7 @@ defmodule StellarBase.XDR.SCAddressType do
   def decode_xdr!(bytes, spec \\ @enum_spec)
 
   def decode_xdr!(bytes, spec) do
-    {%XDR.Enum{identifier: code}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
-    {new(code), rest}
+    {%XDR.Enum{identifier: type}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
+    {new(type), rest}
   end
 end
diff --git a/lib/xdr/contract/sc_contract_code_type.ex b/lib/xdr/contract/sc_contract_code_type.ex
@@ -16,20 +16,20 @@ defmodule StellarBase.XDR.SCContractCodeType do
 
   defstruct [:identifier]
 
-  @spec new(code :: atom()) :: t()
-  def new(code), do: %__MODULE__{identifier: code}
+  @spec new(type :: atom()) :: t()
+  def new(type), do: %__MODULE__{identifier: type}
 
   @impl true
-  def encode_xdr(%__MODULE__{identifier: code}) do
+  def encode_xdr(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr()
   end
 
   @impl true
-  def encode_xdr!(%__MODULE__{identifier: code}) do
+  def encode_xdr!(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr!()
   end
 
@@ -38,7 +38,7 @@ defmodule StellarBase.XDR.SCContractCodeType do
 
   def decode_xdr(bytes, spec) do
     case XDR.Enum.decode_xdr(bytes, spec) do
-      {:ok, {%XDR.Enum{identifier: code}, rest}} -> {:ok, {new(code), rest}}
+      {:ok, {%XDR.Enum{identifier: type}, rest}} -> {:ok, {new(type), rest}}
       error -> error
     end
   end
@@ -47,7 +47,7 @@ defmodule StellarBase.XDR.SCContractCodeType do
   def decode_xdr!(bytes, spec \\ @enum_spec)
 
   def decode_xdr!(bytes, spec) do
-    {%XDR.Enum{identifier: code}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
-    {new(code), rest}
+    {%XDR.Enum{identifier: type}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
+    {new(type), rest}
   end
 end
diff --git a/lib/xdr/contract/sc_object_type.ex b/lib/xdr/contract/sc_object_type.ex
@@ -24,20 +24,20 @@ defmodule StellarBase.XDR.SCObjectType do
 
   defstruct [:identifier]
 
-  @spec new(code :: atom()) :: t()
-  def new(code), do: %__MODULE__{identifier: code}
+  @spec new(type :: atom()) :: t()
+  def new(type), do: %__MODULE__{identifier: type}
 
   @impl true
-  def encode_xdr(%__MODULE__{identifier: code}) do
+  def encode_xdr(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr()
   end
 
   @impl true
-  def encode_xdr!(%__MODULE__{identifier: code}) do
+  def encode_xdr!(%__MODULE__{identifier: type}) do
     @declarations
-    |> XDR.Enum.new(code)
+    |> XDR.Enum.new(type)
     |> XDR.Enum.encode_xdr!()
   end
 
@@ -46,7 +46,7 @@ defmodule StellarBase.XDR.SCObjectType do
 
   def decode_xdr(bytes, spec) do
     case XDR.Enum.decode_xdr(bytes, spec) do
-      {:ok, {%XDR.Enum{identifier: code}, rest}} -> {:ok, {new(code), rest}}
+      {:ok, {%XDR.Enum{identifier: type}, rest}} -> {:ok, {new(type), rest}}
       error -> error
     end
   end
@@ -55,7 +55,7 @@ defmodule StellarBase.XDR.SCObjectType do
   def decode_xdr!(bytes, spec \\ @enum_spec)
 
   def decode_xdr!(bytes, spec) do
-    {%XDR.Enum{identifier: code}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
-    {new(code), rest}
+    {%XDR.Enum{identifier: type}, rest} = XDR.Enum.decode_xdr!(bytes, spec)
+    {new(type), rest}
   end
 end
diff --git a/lib/xdr/contract/sc_status.ex b/lib/xdr/contract/sc_status.ex
@@ -43,7 +43,7 @@ defmodule StellarBase.XDR.SCStatus do
           | SCHostAuthErrorCode.t()
           | SCStatusType.t()
           | UInt32.t()
-          | Void
+          | Void.t()
 
   @type t :: %__MODULE__{code: code(), type: SCStatusType.t()}
 

diff --git a/lib/xdr/contract/sc_val.ex b/lib/xdr/contract/sc_val.ex
@@ -28,7 +28,7 @@ defmodule StellarBase.XDR.SCVal do
     SCV_STATUS: SCStatus
   ]
 
-  @type code ::
+  @type value ::
           Int64.t()
           | UInt32.t()
           | Int32.t()
@@ -38,24 +38,24 @@ defmodule StellarBase.XDR.SCVal do
           | UInt64.t()
           | SCStatus.t()
 
-  @type t :: %__MODULE__{code: code(), type: SCValType.t()}
+  @type t :: %__MODULE__{value: value(), type: SCValType.t()}
 
-  defstruct [:code, :type]
+  defstruct [:value, :type]
 
-  @spec new(code :: code(), type :: SCValType.t()) :: t()
-  def new(code, %SCValType{} = type), do: %__MODULE__{code: code, type: type}
+  @spec new(value :: value(), type :: SCValType.t()) :: t()
+  def new(value, %SCValType{} = type), do: %__MODULE__{value: value, type: type}
 
   @impl true
-  def encode_xdr(%__MODULE__{code: code, type: type}) do
+  def encode_xdr(%__MODULE__{value: value, type: type}) do
     type
-    |> XDR.Union.new(@arms, code)
+    |> XDR.Union.new(@arms, value)
     |> XDR.Union.encode_xdr()
   end
 
   @impl true
-  def encode_xdr!(%__MODULE__{code: code, type: type}) do
+  def encode_xdr!(%__MODULE__{value: value, type: type}) do
     type
-    |> XDR.Union.new(@arms, code)
+    |> XDR.Union.new(@arms, value)
     |> XDR.Union.encode_xdr!()
   end
 
@@ -64,7 +64,7 @@ defmodule StellarBase.XDR.SCVal do
 
   def decode_xdr(bytes, spec) do
     case XDR.Union.decode_xdr(bytes, spec) do
-      {:ok, {{type, code}, rest}} -> {:ok, {new(code, type), rest}}
+      {:ok, {{type, value}, rest}} -> {:ok, {new(value, type), rest}}
       error -> error
     end
   end
@@ -73,8 +73,8 @@ defmodule StellarBase.XDR.SCVal do
   def decode_xdr!(bytes, spec \\ union_spec())
 
   def decode_xdr!(bytes, spec) do
-    {{type, code}, rest} = XDR.Union.decode_xdr!(bytes, spec)
-    {new(code, type), rest}
+    {{type, value}, rest} = XDR.Union.decode_xdr!(bytes, spec)
+    {new(value, type), rest}
   end
 
   @spec union_spec() :: XDR.Union.t()

diff --git a/lib/xdr/contract/sc_vec.ex b/lib/xdr/contract/sc_vec.ex
@@ -13,23 +13,23 @@ defmodule StellarBase.XDR.SCVec do
 
   @array_spec %{type: @array_type, max_length: @max_length}
 
-  @type t :: %__MODULE__{scvals: list(SCVal.t())}
+  @type t :: %__MODULE__{sc_vals: list(SCVal.t())}
 
-  defstruct [:scvals]
+  defstruct [:sc_vals]
 
-  @spec new(scvals :: list(SCVal.t())) :: t()
-  def new(scvals), do: %__MODULE__{scvals: scvals}
+  @spec new(sc_vals :: list(SCVal.t())) :: t()
+  def new(sc_vals), do: %__MODULE__{sc_vals: sc_vals}
 
   @impl true
-  def encode_xdr(%__MODULE__{scvals: scvals}) do
-    scvals
+  def encode_xdr(%__MODULE__{sc_vals: sc_vals}) do
+    sc_vals
     |> XDR.VariableArray.new(@array_type, @max_length)
     |> XDR.VariableArray.encode_xdr()
   end
 
   @impl true
-  def encode_xdr!(%__MODULE__{scvals: scvals}) do
-    scvals
+  def encode_xdr!(%__MODULE__{sc_vals: sc_vals}) do
+    sc_vals
     |> XDR.VariableArray.new(@array_type, @max_length)
     |> XDR.VariableArray.encode_xdr!()
   end
@@ -39,7 +39,7 @@ defmodule StellarBase.XDR.SCVec do
 
   def decode_xdr(bytes, spec) do
     case XDR.VariableArray.decode_xdr(bytes, spec) do
-      {:ok, {scvals, rest}} -> {:ok, {new(scvals), rest}}
+      {:ok, {sc_vals, rest}} -> {:ok, {new(sc_vals), rest}}
       error -> error
     end
   end
@@ -48,7 +48,7 @@ defmodule StellarBase.XDR.SCVec do
   def decode_xdr!(bytes, spec \\ @array_spec)
 
   def decode_xdr!(bytes, spec) do
-    {scvals, rest} = XDR.VariableArray.decode_xdr!(bytes, spec)
-    {new(scvals), rest}
+    {sc_vals, rest} = XDR.VariableArray.decode_xdr!(bytes, spec)
+    {new(sc_vals), rest}
   end
 end
diff --git a/lib/xdr/types/variable_opaque256000.ex b/lib/xdr/types/variable_opaque256000.ex
@@ -1,6 +1,6 @@
 defmodule StellarBase.XDR.VariableOpaque256000 do
   @moduledoc """
-  Representation of Stellar `VariableOpaque256000` type.` type.
+  Representation of Stellar `VariableOpaque256000` type.
   """
 
   @behaviour XDR.Declaration

diff --git a/test/xdr/contract/sc_address_type_test.exs b/test/xdr/contract/sc_address_type_test.exs
@@ -17,7 +17,7 @@ defmodule StellarBase.XDR.SCAddressTypeTest do
     setup do
       %{
         codes: @codes,
-        results: @codes |> Enum.map(fn code -> SCAddressType.new(code) end),
+        results: Enum.map(@codes, &SCAddressType.new/1),
         binaries: @binaries
       }
     end

diff --git a/test/xdr/contract/sc_contract_code_type_test.exs b/test/xdr/contract/sc_contract_code_type_test.exs
@@ -17,7 +17,7 @@ defmodule StellarBase.XDR.SCContractCodeTypeTest do
     setup do
       %{
         codes: @codes,
-        results: @codes |> Enum.map(fn code -> SCContractCodeType.new(code) end),
+        results: Enum.map(@codes, &SCContractCodeType.new/1),
         binaries: @binaries
       }
     end

diff --git a/test/xdr/contract/sc_object_type_test.exs b/test/xdr/contract/sc_object_type_test.exs
@@ -33,7 +33,7 @@ defmodule StellarBase.XDR.SCObjectTypeTest do
     setup do
       %{
         codes: @codes,
-        results: @codes |> Enum.map(fn code -> SCObjectType.new(code) end),
+        results: Enum.map(@codes, &SCObjectType.new/1),
         binaries: @binaries
       }
     end

diff --git a/test/xdr/contract/sc_val_test.exs b/test/xdr/contract/sc_val_test.exs
@@ -22,42 +22,42 @@ defmodule StellarBase.XDR.SCValTest do
       discriminants = [
         %{
           val_type: SCValType.new(:SCV_U63),
-          sc_code: Int64.new(2),
+          value: Int64.new(2),
           binary: <<0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2>>
         },
         %{
           val_type: SCValType.new(:SCV_U32),
-          sc_code: UInt32.new(2),
+          value: UInt32.new(2),
           binary: <<0, 0, 0, 1, 0, 0, 0, 2>>
         },
         %{
           val_type: SCValType.new(:SCV_I32),
-          sc_code: Int32.new(3),
+          value: Int32.new(3),
           binary: <<0, 0, 0, 2, 0, 0, 0, 3>>
         },
         %{
           val_type: SCValType.new(:SCV_STATIC),
-          sc_code: SCStatic.new(:SCS_TRUE),
+          value: SCStatic.new(:SCS_TRUE),
           binary: <<0, 0, 0, 3, 0, 0, 0, 1>>
         },
         %{
           val_type: SCValType.new(:SCV_OBJECT),
-          sc_code: OptionalSCObject.new(nil),
+          value: OptionalSCObject.new(nil),
           binary: <<0, 0, 0, 4, 0, 0, 0, 0>>
         },
         %{
           val_type: SCValType.new(:SCV_SYMBOL),
-          sc_code: SCSymbol.new("World"),
+          value: SCSymbol.new("World"),
           binary: <<0, 0, 0, 5, 0, 0, 0, 5, 87, 111, 114, 108, 100, 0, 0, 0>>
         },
         %{
           val_type: SCValType.new(:SCV_BITSET),
-          sc_code: UInt64.new(4),
+          value: UInt64.new(4),
           binary: <<0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 4>>
         },
         %{
           val_type: SCValType.new(:SCV_STATUS),
-          sc_code:
+          value:
             SCStatus.new(
               SCUnknownErrorCode.new(:UNKNOWN_ERROR_GENERAL),
               SCStatusType.new(:SST_UNKNOWN_ERROR)
@@ -70,28 +70,28 @@ defmodule StellarBase.XDR.SCValTest do
     end
 
     test "new/1", %{discriminants: discriminants} do
-      for %{val_type: val_type, sc_code: sc_code} <- discriminants do
-        %SCVal{code: ^sc_code, type: ^val_type} = SCVal.new(sc_code, val_type)
+      for %{val_type: val_type, value: value} <- discriminants do
+        %SCVal{value: ^value, type: ^val_type} = SCVal.new(value, val_type)
       end
     end
 
     test "encode_xdr/1", %{discriminants: discriminants} do
-      for %{sc_code: sc_code, val_type: val_type, binary: binary} <- discriminants do
-        xdr = SCVal.new(sc_code, val_type)
+      for %{value: value, val_type: val_type, binary: binary} <- discriminants do
+        xdr = SCVal.new(value, val_type)
         {:ok, ^binary} = SCVal.encode_xdr(xdr)
       end
     end
 
     test "encode_xdr!/1", %{discriminants: discriminants} do
-      for %{sc_code: sc_code, val_type: val_type, binary: binary} <- discriminants do
-        xdr = SCVal.new(sc_code, val_type)
+      for %{value: value, val_type: val_type, binary: binary} <- discriminants do
+        xdr = SCVal.new(value, val_type)
         ^binary = SCVal.encode_xdr!(xdr)
       end
     end
 
     test "decode_xdr/2", %{discriminants: discriminants} do
-      for %{sc_code: sc_code, val_type: val_type, binary: binary} <- discriminants do
-        xdr = SCVal.new(sc_code, val_type)
+      for %{value: value, val_type: val_type, binary: binary} <- discriminants do
+        xdr = SCVal.new(value, val_type)
         {:ok, {^xdr, ""}} = SCVal.decode_xdr(binary)
       end
     end
@@ -101,8 +101,8 @@ defmodule StellarBase.XDR.SCValTest do
     end
 
     test "decode_xdr!/2", %{discriminants: discriminants} do
-      for %{sc_code: sc_code, val_type: val_type, binary: binary} <- discriminants do
-        xdr = SCVal.new(sc_code, val_type)
+      for %{value: value, val_type: val_type, binary: binary} <- discriminants do
+        xdr = SCVal.new(value, val_type)
         {^xdr, ""} = SCVal.decode_xdr!(binary)
       end
     end