Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Commit

Permalink
Feature/mst batches (#1681)
Browse files Browse the repository at this point in the history 
### Description of the Change
Rework MST with batches;
Update tests and related methods

### Benefits
MST works with batches

### Possible Drawbacks 
Some tests are disabled.

Signed-off-by: Fedor Muratov <[email protected]>
  • Loading branch information
@muratovv @nickaleks
muratovv authored and nickaleks committed Sep 10, 2018
1 parent f3c4594 commit a58275d
Show file tree
Hide file tree
Showing 143 changed files with 261 additions and 590 deletions.
42 changes: 0 additions & 42 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,19 +1025,6 @@ schema/fast:
$(MAKE) -f shared_model/schema/CMakeFiles/schema.dir/build.make shared_model/schema/CMakeFiles/schema.dir/build
.PHONY : schema/fast

#=============================================================================
# Target rules for targets named client_test

# Build rule for target.
client_test: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 client_test
.PHONY : client_test

# fast build rule for target.
client_test/fast:
$(MAKE) -f test/module/iroha-cli/CMakeFiles/client_test.dir/build.make test/module/iroha-cli/CMakeFiles/client_test.dir/build
.PHONY : client_test/fast

#=============================================================================
# Target rules for targets named postgres_executor_test

Expand Down Expand Up @@ -1753,19 +1740,6 @@ query_service_test/fast:
$(MAKE) -f test/module/irohad/torii/CMakeFiles/query_service_test.dir/build.make test/module/irohad/torii/CMakeFiles/query_service_test.dir/build
.PHONY : query_service_test/fast

#=============================================================================
# Target rules for targets named torii_service_test

# Build rule for target.
torii_service_test: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 torii_service_test
.PHONY : torii_service_test

# fast build rule for target.
torii_service_test/fast:
$(MAKE) -f test/module/irohad/torii/CMakeFiles/torii_service_test.dir/build.make test/module/irohad/torii/CMakeFiles/torii_service_test.dir/build
.PHONY : torii_service_test/fast

#=============================================================================
# Target rules for targets named query_processor_test

Expand All @@ -1779,19 +1753,6 @@ query_processor_test/fast:
$(MAKE) -f test/module/irohad/torii/processor/CMakeFiles/query_processor_test.dir/build.make test/module/irohad/torii/processor/CMakeFiles/query_processor_test.dir/build
.PHONY : query_processor_test/fast

#=============================================================================
# Target rules for targets named transaction_processor_test

# Build rule for target.
transaction_processor_test: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 transaction_processor_test
.PHONY : transaction_processor_test

# fast build rule for target.
transaction_processor_test/fast:
$(MAKE) -f test/module/irohad/torii/processor/CMakeFiles/transaction_processor_test.dir/build.make test/module/irohad/torii/processor/CMakeFiles/transaction_processor_test.dir/build
.PHONY : transaction_processor_test/fast

#=============================================================================
# Target rules for targets named stateful_validator_test

Expand Down Expand Up @@ -3054,7 +3015,6 @@ help:
@echo "... shared_model_amount_utils"
@echo "... shared_model_stateless_validation"
@echo "... schema"
@echo "... client_test"
@echo "... postgres_executor_test"
@echo "... block_query_test"
@echo "... wsv_query_command_test"
Expand Down Expand Up @@ -3110,9 +3070,7 @@ help:
@echo "... torii_queries_test"
@echo "... torii_service_query_test"
@echo "... query_service_test"
@echo "... torii_service_test"
@echo "... query_processor_test"
@echo "... transaction_processor_test"
@echo "... stateful_validator_test"
@echo "... chain_validation_test"
@echo "... pending_txs_storage_test"
Expand Down
4 changes: 2 additions & 2 deletions iroha-cli/CMakeFiles/client.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 13
CMAKE_PROGRESS_4 = 13
CMAKE_PROGRESS_5 =

2 changes: 1 addition & 1 deletion iroha-cli/CMakeFiles/iroha-cli.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 29
CMAKE_PROGRESS_3 =

2 changes: 1 addition & 1 deletion iroha-cli/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
37
35
2 changes: 1 addition & 1 deletion iroha-cli/interactive/CMakeFiles/interactive_cli.dir/progress.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = 28
CMAKE_PROGRESS_6 =

2 changes: 1 addition & 1 deletion iroha-cli/interactive/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
35
34
185 changes: 0 additions & 185 deletions iroha.cbp
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion irohad/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
50
51
2 changes: 1 addition & 1 deletion irohad/ametsuchi/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
30
33
2 changes: 1 addition & 1 deletion irohad/consensus/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
29
2 changes: 1 addition & 1 deletion irohad/consensus/yac/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
29
2 changes: 1 addition & 1 deletion irohad/consensus/yac/CMakeFiles/supermajority_check.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_2 = 88

4 changes: 2 additions & 2 deletions irohad/consensus/yac/CMakeFiles/yac.dir/progress.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 = 95
CMAKE_PROGRESS_11 =
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = 95
CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 =

2 changes: 1 addition & 1 deletion irohad/execution/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
27
29
2 changes: 1 addition & 1 deletion irohad/main/CMakeFiles/irohad.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_1 = 29
CMAKE_PROGRESS_2 =

2 changes: 1 addition & 1 deletion irohad/main/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49
50
2 changes: 1 addition & 1 deletion irohad/main/CMakeFiles/raw_block_loader.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 55
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =

2 changes: 1 addition & 1 deletion irohad/model/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
28
30
2 changes: 1 addition & 1 deletion irohad/model/converters/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
27
29
2 changes: 1 addition & 1 deletion irohad/model/generators/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
27
29
2 changes: 1 addition & 1 deletion irohad/multi_sig_transactions/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
28
30
2 changes: 1 addition & 1 deletion irohad/multi_sig_transactions/state/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
28
2 changes: 1 addition & 1 deletion irohad/multi_sig_transactions/storage/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
28
2 changes: 1 addition & 1 deletion irohad/multi_sig_transactions/transport/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
28
30
4 changes: 2 additions & 2 deletions irohad/network/CMakeFiles/block_loader.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 9
CMAKE_PROGRESS_1 = 9
CMAKE_PROGRESS_2 =

4 changes: 2 additions & 2 deletions irohad/network/CMakeFiles/networking.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 42
CMAKE_PROGRESS_1 = 42
CMAKE_PROGRESS_2 =

2 changes: 1 addition & 1 deletion irohad/network/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
37
39
4 changes: 2 additions & 2 deletions irohad/ordering/CMakeFiles/ordering_service.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 44
CMAKE_PROGRESS_4 = 44
CMAKE_PROGRESS_5 =

2 changes: 1 addition & 1 deletion irohad/ordering/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
28
2 changes: 1 addition & 1 deletion irohad/pending_txs_storage/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
26
28
2 changes: 1 addition & 1 deletion irohad/simulator/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15
19
2 changes: 1 addition & 1 deletion irohad/simulator/CMakeFiles/simulator.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_2 = 83

2 changes: 1 addition & 1 deletion irohad/synchronizer/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
31
33
2 changes: 1 addition & 1 deletion irohad/synchronizer/CMakeFiles/synchronizer.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 88
CMAKE_PROGRESS_2 =

2 changes: 1 addition & 1 deletion irohad/torii/CMakeFiles/status_bus.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 86
CMAKE_PROGRESS_2 =

2 changes: 1 addition & 1 deletion irohad/torii/CMakeFiles/torii_service.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 90
CMAKE_PROGRESS_3 =

2 changes: 1 addition & 1 deletion irohad/torii/processor/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
31
32
2 changes: 1 addition & 1 deletion irohad/validation/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17
20
2 changes: 1 addition & 1 deletion irohad/validation/CMakeFiles/stateful_validator.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 85
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =

4 changes: 2 additions & 2 deletions schema/CMakeFiles/endpoint.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 = 17
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 17
CMAKE_PROGRESS_3 =

4 changes: 2 additions & 2 deletions schema/CMakeFiles/ordering_grpc.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 43
CMAKE_PROGRESS_2 = 43
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 =

2 changes: 1 addition & 1 deletion schema/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
8
2 changes: 1 addition & 1 deletion shared_model/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
23
2 changes: 1 addition & 1 deletion shared_model/backend/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
21
2 changes: 1 addition & 1 deletion shared_model/backend/protobuf/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
21
30 changes: 15 additions & 15 deletions shared_model/backend/protobuf/CMakeFiles/shared_model_proto_backend.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 72
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_7 = 73
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 = 73
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 =
CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 =
CMAKE_PROGRESS_14 =
CMAKE_PROGRESS_14 = 74
CMAKE_PROGRESS_15 =
CMAKE_PROGRESS_16 = 74
CMAKE_PROGRESS_16 =
CMAKE_PROGRESS_17 =
CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 =
CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_20 = 75
CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 =
CMAKE_PROGRESS_23 = 75
CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 =
CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_27 = 76
CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_30 = 76
CMAKE_PROGRESS_30 =
CMAKE_PROGRESS_31 =
CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_34 = 77
CMAKE_PROGRESS_35 =
CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 = 77
CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_41 = 78
CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 78
CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 =
CMAKE_PROGRESS_45 =
CMAKE_PROGRESS_46 =
CMAKE_PROGRESS_47 =
CMAKE_PROGRESS_48 =
CMAKE_PROGRESS_48 = 79
CMAKE_PROGRESS_49 =
CMAKE_PROGRESS_50 = 79
CMAKE_PROGRESS_50 =

2 changes: 1 addition & 1 deletion shared_model/bindings/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
23
2 changes: 1 addition & 1 deletion shared_model/builders/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21
22
2 changes: 1 addition & 1 deletion shared_model/builders/protobuf/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
21
22
4 changes: 2 additions & 2 deletions ...del/cryptography/ed25519_sha3_impl/CMakeFiles/shared_model_cryptography.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_1 = 63
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 63
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =

4 changes: 2 additions & 2 deletions ...odel/cryptography/model_impl/CMakeFiles/shared_model_cryptography_model.dir/progress.make
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_4 = 64
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = 64
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 =

2 changes: 1 addition & 1 deletion shared_model/interfaces/CMakeFiles/progress.marks
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
14
Loading

0 comments on commit a58275d

Please sign in to comment.