[refactor] hyperledger-iroha#3660: Remove unused boxed structures

Signed-off-by: Shanin Roman <[email protected]>
Erigara · Mar 1, 2024 · bc2b69b · bc2b69b
1 parent 1304cfc
commit bc2b69b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 110 deletions.
diff --git a/configs/swarm/executor.wasm b/configs/swarm/executor.wasm
diff --git a/configs/swarm/genesis.json b/configs/swarm/genesis.json
@@ -89,20 +89,16 @@
       {
         "Mint": {
           "Asset": {
-            "Numeric": {
-              "object": "13",
-              "destination_id": "rose##alice@wonderland"
-            }
+            "object": "13",
+            "destination_id": "rose##alice@wonderland"
           }
         }
       },
       {
         "Mint": {
           "Asset": {
-            "Numeric": {
-              "object": "44",
-              "destination_id": "cabbage#garden_of_live_flowers#alice@wonderland"
-            }
+            "object": "44",
+            "destination_id": "cabbage#garden_of_live_flowers#alice@wonderland"
           }
         }
       },

diff --git a/core/src/smartcontracts/isi/mod.rs b/core/src/smartcontracts/isi/mod.rs
@@ -107,17 +107,6 @@ impl Execute for AccountMintBox {
     }
 }
 
-impl Execute for AssetMintBox {
-    fn execute(
-        self,
-        authority: &AccountId,
-        wsv: &mut WorldStateView,
-    ) -> std::prelude::v1::Result<(), Error> {
-        let Self::Numeric(isi) = self;
-        isi.execute(authority, wsv)
-    }
-}
-
 impl Execute for BurnBox {
     #[iroha_logger::log(name = "burn", skip_all, fields(destination))]
     fn execute(self, authority: &AccountId, wsv: &mut WorldStateView) -> Result<(), Error> {
@@ -129,17 +118,6 @@ impl Execute for BurnBox {
     }
 }
 
-impl Execute for AssetBurnBox {
-    fn execute(
-        self,
-        authority: &AccountId,
-        wsv: &mut WorldStateView,
-    ) -> std::prelude::v1::Result<(), Error> {
-        let Self::Numeric(isi) = self;
-        isi.execute(authority, wsv)
-    }
-}
-
 impl Execute for TransferBox {
     #[iroha_logger::log(name = "transfer", skip_all, fields(from, to))]
     fn execute(self, authority: &AccountId, wsv: &mut WorldStateView) -> Result<(), Error> {

diff --git a/data_model/src/isi.rs b/data_model/src/isi.rs
@@ -673,12 +673,6 @@ mod transparent {
     => AccountMintBoxRef<'a> => MintBoxRef<'a>[Account]
     }
 
-    impl_into_box! {
-        Mint<Numeric, Asset>
-    => AssetMintBox => MintBox[Asset],
-    => AssetMintBoxRef<'a> => MintBoxRef<'a>[Asset]
-    }
-
     impl_into_box! {
         Mint<PublicKey, Account> |
         Mint<SignatureCheckCondition, Account> |
@@ -741,12 +735,6 @@ mod transparent {
         destination_id,
     }
 
-    impl_into_box! {
-        Burn<Numeric, Asset>
-    => AssetBurnBox => BurnBox[Asset],
-    => AssetBurnBoxRef<'a> => BurnBoxRef<'a>[Asset]
-    }
-
     impl_into_box! {
         Burn<PublicKey, Account> |
         Burn<Numeric, Asset> |
@@ -1117,8 +1105,7 @@ isi_box! {
         #[enum_ref(transparent)]
         Account(AccountMintBox),
         /// Mint for [`Asset`].
-        #[enum_ref(transparent)]
-        Asset(AssetMintBox),
+        Asset(Mint<Numeric, Asset>),
         /// Mint [`Trigger`] repetitions.
         TriggerRepetitions(Mint<u32, Trigger<TriggeringFilterBox>>),
     }
@@ -1139,19 +1126,6 @@ isi_box! {
     }
 }
 
-isi_box! {
-    #[strum_discriminants(
-        vis(pub(crate)),
-        name(AssetMintType),
-        derive(Encode),
-    )]
-    /// Enum with all supported [`Mint`] instructions related to [`Asset`].
-    pub enum AssetMintBox {
-        /// Mint [`Asset`] of [`Numeric`] type.
-        Numeric(Mint<Numeric, Asset>),
-    }
-}
-
 isi_box! {
     #[strum_discriminants(
         vis(pub(crate)),
@@ -1163,26 +1137,12 @@ isi_box! {
         /// Burn [`PublicKey`] for [`Account`].
         AccountPublicKey(Burn<PublicKey, Account>),
         /// Burn [`Asset`].
-        #[enum_ref(transparent)]
-        Asset(AssetBurnBox),
+        Asset(Burn<Numeric, Asset>),
         /// Burn [`Trigger`] repetitions.
         TriggerRepetitions(Burn<u32, Trigger<TriggeringFilterBox>>),
     }
 }
 
-isi_box! {
-    #[strum_discriminants(
-        vis(pub(crate)),
-        name(AssetBurnType),
-        derive(Encode),
-    )]
-    /// Enum with all supported [`Burn`] instructions related to [`Asset`].
-    pub enum AssetBurnBox {
-        /// Burn [`Asset`] of [`Numeric`] type.
-        Numeric(Burn<Numeric, Asset>),
-    }
-}
-
 isi_box! {
     #[strum_discriminants(
         vis(pub(crate)),
@@ -1556,9 +1516,9 @@ pub mod error {
 /// The prelude re-exports most commonly used traits, structs and macros from this crate.
 pub mod prelude {
     pub use super::{
-        AccountMintBox, AssetBurnBox, AssetMintBox, AssetTransferBox, Burn, BurnBox,
-        ExecuteTrigger, Fail, Grant, GrantBox, InstructionBox, Log, Mint, MintBox, NewParameter,
-        Register, RegisterBox, RemoveKeyValue, RemoveKeyValueBox, Revoke, RevokeBox, SetKeyValue,
-        SetKeyValueBox, SetParameter, Transfer, TransferBox, Unregister, UnregisterBox, Upgrade,
+        AccountMintBox, AssetTransferBox, Burn, BurnBox, ExecuteTrigger, Fail, Grant, GrantBox,
+        InstructionBox, Log, Mint, MintBox, NewParameter, Register, RegisterBox, RemoveKeyValue,
+        RemoveKeyValueBox, Revoke, RevokeBox, SetKeyValue, SetKeyValueBox, SetParameter, Transfer,
+        TransferBox, Unregister, UnregisterBox, Upgrade,
     };
 }
diff --git a/data_model/src/visit.rs b/data_model/src/visit.rs
@@ -306,19 +306,15 @@ pub fn visit_mint<V: Visit + ?Sized>(visitor: &mut V, authority: &AccountId, isi
                 visitor.visit_mint_account_signature_check_condition(authority, obj)
             }
         },
-        MintBox::Asset(mint_asset) => match mint_asset {
-            AssetMintBox::Numeric(obj) => visitor.visit_mint_asset_numeric(authority, obj),
-        },
+        MintBox::Asset(obj) => visitor.visit_mint_asset_numeric(authority, obj),
         MintBox::TriggerRepetitions(obj) => visitor.visit_mint_trigger_repetitions(authority, obj),
     }
 }
 
 pub fn visit_burn<V: Visit + ?Sized>(visitor: &mut V, authority: &AccountId, isi: &BurnBox) {
     match isi {
         BurnBox::AccountPublicKey(obj) => visitor.visit_burn_account_public_key(authority, obj),
-        BurnBox::Asset(burn_asset) => match burn_asset {
-            AssetBurnBox::Numeric(obj) => visitor.visit_burn_asset_numeric(authority, obj),
-        },
+        BurnBox::Asset(obj) => visitor.visit_burn_asset_numeric(authority, obj),
         BurnBox::TriggerRepetitions(obj) => visitor.visit_burn_trigger_repetitions(authority, obj),
     }
 }

diff --git a/docs/source/references/schema.json b/docs/source/references/schema.json
@@ -279,15 +279,6 @@
       }
     ]
   },
-  "AssetBurnBox": {
-    "Enum": [
-      {
-        "tag": "Numeric",
-        "discriminant": 0,
-        "type": "Burn<Numeric, Asset>"
-      }
-    ]
-  },
   "AssetChanged": {
     "Struct": [
       {
@@ -533,15 +524,6 @@
       }
     ]
   },
-  "AssetMintBox": {
-    "Enum": [
-      {
-        "tag": "Numeric",
-        "discriminant": 0,
-        "type": "Mint<Numeric, Asset>"
-      }
-    ]
-  },
   "AssetTransferBox": {
     "Enum": [
       {
@@ -741,7 +723,7 @@
       {
         "tag": "Asset",
         "discriminant": 1,
-        "type": "AssetBurnBox"
+        "type": "Burn<Numeric, Asset>"
       },
       {
         "tag": "TriggerRepetitions",
@@ -751,6 +733,12 @@
     ]
   },
   "ChainId": "String",
+  "Compact<u128>": {
+    "Int": "Compact"
+  },
+  "Compact<u32>": {
+    "Int": "Compact"
+  },
   "ConfigurationEvent": {
     "Enum": [
       {
@@ -2516,7 +2504,7 @@
       {
         "tag": "Asset",
         "discriminant": 1,
-        "type": "AssetMintBox"
+        "type": "Mint<Numeric, Asset>"
       },
       {
         "tag": "TriggerRepetitions",
@@ -2691,11 +2679,11 @@
     "Struct": [
       {
         "name": "mantissa",
-        "type": "u128"
+        "type": "Compact<u128>"
       },
       {
         "name": "scale",
-        "type": "u32"
+        "type": "Compact<u32>"
       }
     ]
   },

diff --git a/schema/gen/src/lib.rs b/schema/gen/src/lib.rs
@@ -72,7 +72,6 @@ types!(
     Action<TriggeringFilterBox>,
     Algorithm,
     Asset,
-    AssetBurnBox,
     AssetChanged,
     AssetDefinition,
     AssetDefinitionEvent,
@@ -85,7 +84,6 @@ types!(
     AssetEventFilter,
     AssetFilter,
     AssetId,
-    AssetMintBox,
     AssetTransferBox,
     AssetValue,
     AssetValueType,

diff --git a/tools/parity_scale_decoder/samples/trigger.bin b/tools/parity_scale_decoder/samples/trigger.bin
diff --git a/tools/parity_scale_decoder/samples/trigger.json b/tools/parity_scale_decoder/samples/trigger.json
@@ -6,10 +6,8 @@
                 {
                     "Mint": {
                         "Asset": {
-                            "Numeric": {
-                                "object": "1",
-                                "destination_id": "rose##alice@wonderland"
-                            }
+                            "object": "1",
+                            "destination_id": "rose##alice@wonderland"
                         }
                     }
                 }