Remove validator_id method from AfterCommitContext (#1508)

Author: popzxc

exonum/src/helpers/mod.rs

@@ -21,6 +21,7 @@ pub mod multisig;
 pub mod user_agent;
 #[macro_use]
 pub mod metrics;
+pub mod validator;
 
 use env_logger::Builder;
 use log::SetLoggerError;

exonum/src/helpers/validator.rs

@@ -0,0 +1,25 @@
+// Copyright 2019 The Exonum Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use exonum_crypto::PublicKey;
+use exonum_merkledb::Snapshot;
+
+use crate::{blockchain::Schema as CoreSchema, helpers::ValidatorId};
+
+/// Attempts to find a `ValidatorId` by the provided service public key.
+pub fn validator_id(snapshot: &dyn Snapshot, service_public_key: PublicKey) -> Option<ValidatorId> {
+    CoreSchema::new(snapshot)
+        .consensus_config()
+        .find_validator(|validator_keys| service_public_key == validator_keys.service_key)
+}

exonum/src/runtime/rust/service.rs

@@ -19,7 +19,7 @@ use std::fmt::{self, Debug};
 use crate::{
     blockchain::Schema as CoreSchema,
     crypto::{Hash, PublicKey, SecretKey},
-    helpers::{Height, ValidatorId},
+    helpers::Height,
     messages::Verified,
     node::ApiSender,
     runtime::{
@@ -191,16 +191,6 @@ impl<'a, 'b> TransactionContext<'a, 'b> {
         &self.inner.caller
     }
 
-    /// Returns the validator ID if the transaction author is a validator.
-    pub fn validator_id(&self) -> Option<ValidatorId> {
-        // TODO Perhaps we should optimize this method [ECR-3222]
-        self.caller().author().and_then(|author| {
-            CoreSchema::new(self.fork())
-                .consensus_config()
-                .find_validator(|validator_keys| author == validator_keys.service_key)
-        })
-    }
-
     /// Enqueue dispatcher action.
     pub fn dispatch_action(&self, action: dispatcher::Action) {
         self.inner
@@ -331,14 +321,6 @@ impl<'a> AfterCommitContext<'a> {
         }
     }
 
-    /// Returns the validator ID if the current node is a validator.
-    pub fn validator_id(&self) -> Option<ValidatorId> {
-        // TODO Perhaps we should optimize this method [ECR-3222]
-        CoreSchema::new(self.snapshot)
-            .consensus_config()
-            .find_validator(|validator_keys| self.service_keypair.0 == validator_keys.service_key)
-    }
-
     /// Returns a current blockchain height. This height is "height of the latest committed block".
     pub fn height(&self) -> Height {
         // TODO Perhaps we should optimize this method [ECR-3222]

services/supervisor/src/lib.rs

@@ -31,7 +31,7 @@ pub use self::{
 use exonum::{
     blockchain::{self, InstanceCollection},
     crypto::Hash,
-    helpers::byzantine_quorum,
+    helpers::{byzantine_quorum, validator::validator_id},
     runtime::{
         api::ServiceApiBuilder,
         rust::{AfterCommitContext, BeforeCommitContext, Service, Transaction},
@@ -129,7 +129,8 @@ impl Service for Supervisor {
                     let tx_sender = context.transaction_broadcaster();
                     let keypair = context.service_keypair.clone();
                     let instance_id = context.instance.id;
-                    let is_validator = context.validator_id().is_some();
+                    let is_validator =
+                        validator_id(context.snapshot, context.service_keypair.0).is_some();
                     move || {
                         if is_validator {
                             trace!(

services/time/src/lib.rs

@@ -44,6 +44,7 @@ pub mod transactions;
 
 use exonum::{
     crypto::Hash,
+    helpers::validator::validator_id,
     runtime::{
         api::ServiceApiBuilder,
         rust::{AfterCommitContext, Service},
@@ -84,7 +85,7 @@ impl Service for TimeService {
     /// Creates transaction after commit of the block.
     fn after_commit(&self, context: AfterCommitContext) {
         // The transaction must be created by the validator.
-        if context.validator_id().is_some() {
+        if validator_id(context.snapshot, context.service_keypair.0).is_some() {
             context.broadcast_transaction(TxTime::new(self.time.current_time()));
         }
     }