[refactor] #1650: tidy up `data_model` #1645

mversic · 2021-11-30T00:32:53Z

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

Description of the Change

Move World from data_model into wsv as it will never be used by clients.
Implement IntoSchema for blocks and transitive dependencies as a preparation for block streaming
rename Query -> ExecutableQuery, QueryOutput -> Query
fix roles feature inconsistencies
move some transaction structures to data_model. Will be used for block streaming

Issue

Closes #1650

Benefits

decoupled iroha_client and iroha_core libraries. Client should never depend on core

Possible Drawbacks

Usage Examples or Tests [optional]

Alternate Designs [optional]

codecov · 2021-11-30T00:49:43Z

Codecov Report

Merging #1645 (4db7f4c) into iroha2-dev (4341b35) will increase coverage by 0.18%.
The diff coverage is 63.91%.

@@              Coverage Diff               @@
##           iroha2-dev    #1645      +/-   ##
==============================================
+ Coverage       77.18%   77.36%   +0.18%     
==============================================
  Files             127      128       +1     
  Lines           20403    20403              
==============================================
+ Hits            15748    15785      +37     
+ Misses           4655     4618      -37

Impacted Files	Coverage Δ
client/src/client.rs	`78.41% <ø> (+1.24%)`	⬆️
config/src/runtime_upgrades.rs	`79.31% <ø> (ø)`
core/src/lib.rs	`62.34% <ø> (ø)`
core/src/queue.rs	`98.04% <ø> (+0.21%)`	⬆️
core/src/smartcontracts/isi/account.rs	`46.00% <0.00%> (+0.45%)`	⬆️
core/src/smartcontracts/isi/asset.rs	`63.07% <ø> (ø)`
core/src/smartcontracts/isi/domain.rs	`48.44% <ø> (ø)`
core/src/smartcontracts/isi/tx.rs	`80.00% <ø> (ø)`
core/src/smartcontracts/isi/world.rs	`69.23% <ø> (+2.56%)`	⬆️
core/src/smartcontracts/mod.rs	`100.00% <ø> (ø)`
... and 41 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4341b35...4db7f4c. Read the comment docs.

core/src/tx.rs

core/src/wsv.rs

data_model/src/lib.rs

core/src/smartcontracts/mod.rs

mversic · 2021-11-30T18:38:49Z

data_model/src/lib.rs

+        /// The [`Transaction`]'s payload.
+        pub payload: Payload,
+        /// [`Transaction`]'s [`Signature`]s.
+        pub signatures: SignaturesOf<Payload>,


had to made these fields public

core/src/kura.rs

appetrosyan · 2021-12-02T06:55:01Z

config/src/lib.rs

+            DEFAULT_MAX_LOG_LEVEL
+        }
+    }
+}


Just a consideration. Do you think it would be better to move all configurations into the config crate, and privatise some of the fields?

I did this only because I had to, otherwise dependencies would bleed between crates. Namely, iroha_data_model would have to be dependecy of crates with configuration or the other way around and logically they shouldn't be

but yes, this can be repeated if dynamic configuration is added for those config fields. Maybe I should comment that somewhere?

config/src/lib.rs

core/src/queue.rs

core/src/wsv.rs

data_model/src/transaction.rs

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

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

mversic requested review from appetrosyan, e-ivkov, i1i1, KalitaAlexey and s8sato as code owners November 30, 2021 00:32

github-actions bot added the iroha2-dev The re-implementation of a BFT hyperledger in RUST label Nov 30, 2021

mversic force-pushed the data_model_refactor branch from 967e626 to bcc7539 Compare November 30, 2021 00:45

appetrosyan reviewed Nov 30, 2021

View reviewed changes

appetrosyan added the Refactor Improvement to overall code quality label Nov 30, 2021

appetrosyan previously approved these changes Nov 30, 2021

View reviewed changes

mversic dismissed appetrosyan’s stale review via baaa78d November 30, 2021 12:24

mversic force-pushed the data_model_refactor branch 2 times, most recently from c1ec6af to 537a2e4 Compare November 30, 2021 14:15

appetrosyan changed the title ~~tidy up data_model~~ [refactor] tidy up data_model Nov 30, 2021

mversic force-pushed the data_model_refactor branch from 537a2e4 to 674e256 Compare November 30, 2021 14:59

mversic commented Nov 30, 2021

View reviewed changes

core/src/smartcontracts/mod.rs Outdated Show resolved Hide resolved

mversic force-pushed the data_model_refactor branch 6 times, most recently from 45b4d5a to 1751048 Compare November 30, 2021 17:35

mversic commented Nov 30, 2021

View reviewed changes

s8sato previously approved these changes Dec 1, 2021

View reviewed changes

core/src/kura.rs Outdated Show resolved Hide resolved

mversic dismissed s8sato’s stale review via 3056fb7 December 1, 2021 12:47

mversic force-pushed the data_model_refactor branch from 4c91b29 to 3056fb7 Compare December 1, 2021 12:47

s8sato previously approved these changes Dec 1, 2021

View reviewed changes

mversic dismissed s8sato’s stale review via fa4cd44 December 1, 2021 20:14

mversic force-pushed the data_model_refactor branch from 3056fb7 to fa4cd44 Compare December 1, 2021 20:14

mversic changed the title ~~[refactor] tidy up data_model~~ [refactor] #1650: tidy up data_model Dec 1, 2021

mversic force-pushed the data_model_refactor branch from ed35796 to 25b64c5 Compare December 1, 2021 23:15

mversic requested review from s8sato and appetrosyan December 1, 2021 23:18

mversic force-pushed the data_model_refactor branch from 25b64c5 to fa4cd44 Compare December 2, 2021 00:47