implement derive macro for generating ffi methods

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>

Cargo.toml

@@ -15,6 +15,7 @@ members = [
   "tools/parity_scale_decoder",
   "tools/kagami",
   "data_model",
+  "data_model/derive",
   "data_model/primitives",
   "futures",
   "futures/derive",

cli/src/lib.rs

@@ -161,15 +161,13 @@ where
         let network_addr = network.start().await;
 
         let (events_sender, _) = broadcast::channel(100);
+        let world = W::with(
+            domains(&config),
+            config.sumeragi.trusted_peers.peers.clone(),
+        );
         let wsv = Arc::new(
-            WorldStateView::from_configuration(
-                config.wsv,
-                W::with(
-                    domains(&config),
-                    config.sumeragi.trusted_peers.peers.clone(),
-                ),
-            )
-            .with_events(events_sender.clone()),
+            WorldStateView::from_configuration(config.wsv.clone(), world)
+                .with_events(events_sender.clone()),
         );
 
         let query_validator = Arc::new(query_validator);

cli/src/torii/tests.rs

@@ -264,13 +264,10 @@ fn register_account(name: &str) -> Instruction {
 }
 
 fn register_asset_definition(name: &str) -> Instruction {
-    RegisterBox::new(
-        AssetDefinition::quantity(AssetDefinitionId::new(
-            name.parse().expect("Valid"),
-            DOMAIN.parse().expect("Valid"),
-        ))
-        .build(),
-    )
+    RegisterBox::new(AssetDefinition::quantity(AssetDefinitionId::new(
+        name.parse().expect("Valid"),
+        DOMAIN.parse().expect("Valid"),
+    )))
     .into()
 }
 

client/benches/torii.rs

@@ -57,8 +57,7 @@ fn query_requests(criterion: &mut Criterion) {
         .into();
     let create_account = RegisterBox::new(Account::new(account_id.clone(), [public_key]));
     let asset_definition_id = AssetDefinitionId::new("xor".parse().expect("Valid"), domain_id);
-    let create_asset =
-        RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()));
     let quantity: u32 = 200;
     let mint_asset = MintBox::new(
         Value::U32(quantity),

client/examples/million_accounts_genesis.rs

@@ -21,12 +21,8 @@ fn main() {
                     key_pair.public_key().clone(),
                 )
                 .with_asset(
-                    AssetDefinition::quantity(
-                        format!("xor-{}", i)
-                            .parse::<<AssetDefinition as Identifiable>::Id>()
-                            .expect("Valid"),
-                    )
-                    .build(),
+                    format!("xor-{}", i).parse().expect("Valid"),
+                    AssetValueType::Quantity,
                 )
                 .finish_domain();
         }

client/tests/integration/add_asset.rs

@@ -17,8 +17,7 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount() ->
     // Given
     let account_id = AccountId::from_str("alice@wonderland").expect("Valid");
     let asset_definition_id = AssetDefinitionId::from_str("xor#wonderland").expect("Valid");
-    let create_asset =
-        RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()));
     let metadata = iroha_data_model::metadata::UnlimitedMetadata::default();
     //When
     let quantity: u32 = 200;
@@ -49,8 +48,7 @@ fn client_add_big_asset_quantity_to_existing_asset_should_increase_asset_amount(
     // Given
     let account_id = AccountId::from_str("alice@wonderland").expect("Valid");
     let asset_definition_id = AssetDefinitionId::from_str("xor#wonderland").expect("Valid");
-    let create_asset =
-        RegisterBox::new(AssetDefinition::big_quantity(asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::big_quantity(asset_definition_id.clone()));
     let metadata = iroha_data_model::metadata::UnlimitedMetadata::default();
     //When
     let quantity: u128 = 2_u128.pow(65);
@@ -80,7 +78,7 @@ fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
     // Given
     let account_id = AccountId::from_str("alice@wonderland").expect("Valid");
     let asset_definition_id = AssetDefinitionId::from_str("xor#wonderland").expect("Valid");
-    let identifiable_box = AssetDefinition::fixed(asset_definition_id.clone()).build();
+    let identifiable_box = AssetDefinition::fixed(asset_definition_id.clone());
     let create_asset = RegisterBox::new(identifiable_box);
     let metadata = iroha_data_model::metadata::UnlimitedMetadata::default();
 
@@ -132,16 +130,18 @@ fn client_add_asset_with_name_length_more_than_limit_should_not_commit_transacti
 
     // Given
     let normal_asset_definition_id = AssetDefinitionId::from_str("xor#wonderland").expect("Valid");
-    let create_asset =
-        RegisterBox::new(AssetDefinition::quantity(normal_asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::quantity(
+        normal_asset_definition_id.clone(),
+    ));
     test_client.submit(create_asset)?;
     iroha_logger::info!("Creating asset");
 
     let too_long_asset_name = "0".repeat(2_usize.pow(14));
     let incorrect_asset_definition_id =
         AssetDefinitionId::from_str(&(too_long_asset_name + "#wonderland")).expect("Valid");
-    let create_asset =
-        RegisterBox::new(AssetDefinition::quantity(incorrect_asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::quantity(
+        incorrect_asset_definition_id.clone(),
+    ));
 
     test_client.submit(create_asset)?;
     iroha_logger::info!("Creating another asset");

client/tests/integration/asset_propagation.rs

@@ -23,8 +23,7 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount_on_a
     let (public_key, _) = KeyPair::generate()?.into();
     let create_account = RegisterBox::new(Account::new(account_id.clone(), [public_key]));
     let asset_definition_id = AssetDefinitionId::from_str("xor#domain")?;
-    let create_asset =
-        RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()).build());
+    let create_asset = RegisterBox::new(AssetDefinition::quantity(asset_definition_id.clone()));
     iroha_client.submit_all(vec![
         create_domain.into(),
         create_account.into(),