Merge remote-tracking branch 'remotes/upstream/master' into different-supervisor-modes

# Conflicts:
#	exonum-java-binding/core/rust/exonum-java/src/node.rs

Author: Ilya Bogdanov

exonum-java-binding/core/rust/Cargo.lock

@@ -58,6 +58,7 @@ exonum-time = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-build = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-derive = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-cli = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
+exonum-explorer-service = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-proto = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-supervisor = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }
 exonum-crypto = { git = "https://github.com/exonum/exonum", rev = "b81d64ef" }

exonum-java-binding/core/rust/Cargo.toml

@@ -5,6 +5,7 @@ authors = ["Exonum team <[email protected]>"]
 
 [dependencies]
 env_logger = "0.7"
+exonum-explorer-service = "0.13.0-rc.2"
 exonum-supervisor = "0.13.0-rc.2"
 exonum-time = "0.13.0-rc.2"
 failure = "0.1"

exonum-java-binding/core/rust/exonum-java/Cargo.toml

@@ -15,6 +15,7 @@
  */
 
 extern crate env_logger;
+extern crate exonum_explorer_service;
 extern crate exonum_supervisor;
 extern crate exonum_time;
 extern crate java_bindings;

exonum-java-binding/core/rust/exonum-java/src/main.rs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+use exonum_explorer_service::ExplorerFactory;
 use exonum_supervisor::{mode::Mode as SupervisorMode, Supervisor};
 use exonum_time::TimeServiceFactory;
 use java_bindings::{
@@ -25,13 +26,12 @@ use java_bindings::{
         },
         exonum_merkledb::{Database, RocksDB},
         node::{ApiSender, Node, NodeChannel, NodeConfig as CoreNodeConfig},
-        runtime::rust::{RustRuntime, ServiceFactory},
+        runtime::rust::{DefaultInstance, RustRuntime, RustRuntimeBuilder, ServiceFactory},
     },
     Command, Config, DefaultConfigManager, EjbCommand, EjbCommandResult, Executor, InternalConfig,
     JavaRuntimeProxy,
 };
 
-use java_bindings::exonum::runtime::rust::RustRuntimeBuilder;
 use std::sync::Arc;
 
 pub fn run_node(command: Command) -> Result<(), failure::Error> {
@@ -74,6 +74,8 @@ fn create_blockchain(
     let genesis_config = GenesisConfigBuilder::with_consensus_config(node_config.consensus)
         .with_artifact(Supervisor.artifact_id())
         .with_instance(supervisor_service)
+        .with_artifact(ExplorerFactory.artifact_id())
+        .with_instance(ExplorerFactory.default_instance())
         .build();
 
     let rust_runtime = create_rust_runtime(channel);
@@ -89,6 +91,7 @@ fn create_rust_runtime(channel: &NodeChannel) -> RustRuntime {
     RustRuntimeBuilder::new()
         .with_factory(TimeServiceFactory::default())
         .with_factory(Supervisor)
+        .with_factory(ExplorerFactory)
         .build(channel.endpoints.0.clone())
 }
 

exonum-java-binding/core/rust/exonum-java/src/node.rs

@@ -93,6 +93,7 @@ export RUST_LOG="${RUST_LOG-warn,exonum=info,exonum-java=info,java_bindings=info
 header "GENERATE COMMON CONFIG"
 cargo +${RUST_COMPILER_VERSION} run -- generate-template \
     --validators-count=1 \
+    --supervisor-mode simple \
     ${COMMON_CONFIG_PATH}
 
 header "GENERATE CONFIG"

exonum-java-binding/core/rust/exonum-java/start_node.sh

@@ -38,6 +38,7 @@ export RUST_LOG="${RUST_LOG-error,exonum=info,exonum-java=info,java_bindings=inf
 header "GENERATE COMMON CONFIG"
 ${EXONUM_JAVA_APP} generate-template \
     --validators-count=1 \
+    --supervisor-mode simple \
     testnet/common.toml
 
 header "GENERATE CONFIG"

exonum-java-binding/cryptocurrency-demo/start-node.sh

@@ -293,7 +293,7 @@
       <plugin>
         <groupId>org.pitest</groupId>
         <artifactId>pitest-maven</artifactId>
-        <version>1.4.10</version>
+        <version>1.4.11</version>
         <dependencies>
           <dependency>
             <groupId>org.pitest</groupId>