[refactor] #4291: update genesis config & schema (#4370)

* [refactor] #4291: update genesis config & schema - remove inline executor mode - rename field to `executor_file` - remove genesis from schema (revert #1391) Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>
hyperledger-iroha · Mar 19, 2024 · c9dce26 · c9dce26
1 parent ac872b2
commit c9dce26
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 245 deletions.
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -516,10 +516,11 @@ pub fn read_config_and_genesis<P: AsRef<Path>>(
     let genesis = if let Genesis::Full { key_pair, file } = &config.genesis {
         let raw_block = RawGenesisBlock::from_path(file)?;
 
-        Some(
-            GenesisNetwork::new(raw_block, &config.common.chain_id, key_pair)
-                .wrap_err("Failed to construct the genesis")?,
-        )
+        Some(GenesisNetwork::new(
+            raw_block,
+            &config.common.chain_id,
+            key_pair,
+        ))
     } else {
         None
     };
@@ -559,10 +560,11 @@ mod tests {
     }
 
     mod config_integration {
+        use std::path::PathBuf;
+
         use assertables::{assert_contains, assert_contains_as_result};
         use iroha_config::parameters::user::RootPartial as PartialUserConfig;
         use iroha_crypto::KeyPair;
-        use iroha_genesis::{ExecutorMode, ExecutorPath};
         use iroha_primitives::addr::socket_addr;
         use path_absolutize::Absolutize as _;
 
@@ -591,7 +593,7 @@ mod tests {
             // Given
 
             let genesis = RawGenesisBlockBuilder::default()
-                .executor(ExecutorMode::Path(ExecutorPath("./executor.wasm".into())))
+                .executor_file(PathBuf::from("./executor.wasm"))
                 .build();
 
             let config = {
@@ -649,7 +651,7 @@ mod tests {
             // Given
 
             let genesis = RawGenesisBlockBuilder::default()
-                .executor(ExecutorMode::Path(ExecutorPath("./executor.wasm".into())))
+                .executor_file(PathBuf::from("./executor.wasm"))
                 .build();
 
             let config = {

diff --git a/client/benches/torii.rs b/client/benches/torii.rs
@@ -36,7 +36,7 @@ fn query_requests(criterion: &mut Criterion) {
                 get_key_pair().public_key().clone(),
             )
             .finish_domain()
-            .executor(
+            .executor_blob(
                 construct_executor("../default_executor").expect("Failed to construct executor"),
             )
             .build(),
@@ -45,8 +45,7 @@ fn query_requests(criterion: &mut Criterion) {
             .genesis
             .key_pair()
             .expect("genesis config should be full, probably a bug"),
-    )
-    .expect("genesis creation failed");
+    );
 
     let builder = PeerBuilder::new()
         .with_config(configuration)
@@ -143,7 +142,7 @@ fn instruction_submits(criterion: &mut Criterion) {
                 configuration.common.key_pair.public_key().clone(),
             )
             .finish_domain()
-            .executor(
+            .executor_blob(
                 construct_executor("../default_executor").expect("Failed to construct executor"),
             )
             .build(),
@@ -152,8 +151,7 @@ fn instruction_submits(criterion: &mut Criterion) {
             .genesis
             .key_pair()
             .expect("config should be full; probably a bug"),
-    )
-    .expect("failed to create genesis");
+    );
     let builder = PeerBuilder::new()
         .with_config(configuration)
         .with_into_genesis(genesis);

diff --git a/client/examples/million_accounts_genesis.rs b/client/examples/million_accounts_genesis.rs
@@ -32,7 +32,9 @@ fn generate_genesis(num_domains: u32) -> RawGenesisBlock {
     }
 
     builder
-        .executor(construct_executor("../default_executor").expect("Failed to construct executor"))
+        .executor_blob(
+            construct_executor("../default_executor").expect("Failed to construct executor"),
+        )
         .build()
 }
 
@@ -53,8 +55,7 @@ fn main_genesis() {
             .genesis
             .key_pair()
             .expect("should be available in the config; probably a bug"),
-    )
-    .expect("genesis creation failed");
+    );
 
     let builder = PeerBuilder::new()
         .with_into_genesis(genesis)

diff --git a/config/tests/fixtures/empty_ok_genesis.json b/config/tests/fixtures/empty_ok_genesis.json
@@ -1,4 +1,4 @@
 {
   "transactions": [],
-  "executor": "./executor.wasm"
+  "executor_file": "./executor.wasm"
 }
diff --git a/configs/swarm/genesis.json b/configs/swarm/genesis.json
@@ -184,5 +184,5 @@
       }
     ]
   ],
-  "executor": "./executor.wasm"
+  "executor_file": "./executor.wasm"
 }
diff --git a/core/test_network/src/lib.rs b/core/test_network/src/lib.rs
@@ -15,7 +15,7 @@ use iroha_client::{
 use iroha_config::parameters::actual::Root as Config;
 use iroha_crypto::prelude::*;
 use iroha_data_model::{query::QueryOutputBox, ChainId};
-use iroha_genesis::{GenesisNetwork, RawGenesisBlock};
+use iroha_genesis::{GenesisNetwork, RawGenesisBlockFile};
 use iroha_logger::InstrumentFutures;
 use iroha_primitives::{
     addr::{socket_addr, SocketAddr},
@@ -81,7 +81,7 @@ impl TestGenesis for GenesisNetwork {
         // TODO: Fix this somehow. Probably we need to make `kagami` a library (#3253).
         let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
         let mut genesis =
-            RawGenesisBlock::from_path(manifest_dir.join("../../configs/swarm/genesis.json"))
+            RawGenesisBlockFile::from_path(manifest_dir.join("../../configs/swarm/genesis.json"))
                 .expect("Failed to deserialize genesis block from file");
 
         let rose_definition_id =
@@ -126,15 +126,18 @@ impl TestGenesis for GenesisNetwork {
             first_transaction.append_instruction(isi);
         }
 
-        GenesisNetwork::new(genesis, &cfg.common.chain_id, {
-            use iroha_config::parameters::actual::Genesis;
-            if let Genesis::Full { key_pair, .. } = &cfg.genesis {
-                key_pair
-            } else {
-                unreachable!("test config should contain full genesis config (or it is a bug)")
-            }
-        })
-        .expect("Failed to init genesis")
+        GenesisNetwork::new(
+            genesis.try_into().expect("genesis should load fine"),
+            &cfg.common.chain_id,
+            {
+                use iroha_config::parameters::actual::Genesis;
+                if let Genesis::Full { key_pair, .. } = &cfg.genesis {
+                    key_pair
+                } else {
+                    unreachable!("test config should contain full genesis config (or it is a bug)")
+                }
+            },
+        )
     }
 }
 

diff --git a/docs/source/references/schema.json b/docs/source/references/schema.json
@@ -1001,20 +1001,6 @@
     ]
   },
   "ExecutorEventSet": "u32",
-  "ExecutorMode": {
-    "Enum": [
-      {
-        "tag": "Path",
-        "discriminant": 0,
-        "type": "String"
-      },
-      {
-        "tag": "Inline",
-        "discriminant": 1,
-        "type": "Executor"
-      }
-    ]
-  },
   "Fail": {
     "Struct": [
       {
@@ -2864,18 +2850,6 @@
       }
     ]
   },
-  "RawGenesisBlock": {
-    "Struct": [
-      {
-        "name": "transactions",
-        "type": "Vec<Vec<InstructionBox>>"
-      },
-      {
-        "name": "executor",
-        "type": "ExecutorMode"
-      }
-    ]
-  },
   "Register<Account>": {
     "Struct": [
       {
@@ -4114,9 +4088,6 @@
   "Vec<TransactionValue>": {
     "Vec": "TransactionValue"
   },
-  "Vec<Vec<InstructionBox>>": {
-    "Vec": "Vec<InstructionBox>"
-  },
   "Vec<u8>": {
     "Vec": "u8"
   },

diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
@@ -21,3 +21,6 @@ serde_json = { workspace = true }
 once_cell = { workspace = true }
 tracing = { workspace = true }
 eyre = { workspace = true }
+
+[dev-dependencies]
+iroha_crypto = { workspace = true, features = ["rand"] }