Remove custom action handler of IBC

Author: majecty

core/src/consensus/solo/mod.rs

@@ -25,7 +25,6 @@ use crate::client::ConsensusClient;
 use crate::codechain_machine::CodeChainMachine;
 use crate::consensus::{EngineError, EngineType};
 use crate::error::Error;
-use crate::ibc;
 use ckey::Address;
 use cstate::{ActionHandler, HitHandler, TopStateView};
 use ctypes::{BlockHash, CommonParams, Header};
@@ -49,7 +48,6 @@ impl Solo {
             action_handlers.push(Arc::new(HitHandler::new()));
         }
         action_handlers.push(Arc::new(stake::Stake::new(params.genesis_stakes.clone())));
-        action_handlers.push(Arc::new(ibc::custom_action_handler::IBC::new()));
 
         Solo {
             client: Default::default(),

core/src/consensus/tendermint/engine.rs

@@ -262,7 +262,6 @@ impl ConsensusEngine for Tendermint {
     fn register_client(&self, client: Weak<dyn ConsensusClient>) {
         *self.client.write() = Some(Weak::clone(&client));
         self.stake.register_resources(Weak::clone(&client), Arc::downgrade(&self.validators));
-        self.ibc.register_resources(client);
     }
 
     fn is_proposal(&self, header: &Header) -> bool {

core/src/consensus/tendermint/mod.rs

@@ -32,7 +32,6 @@ pub use self::types::{Height, Step, View};
 pub use super::{stake, ValidatorSet};
 use crate::client::ConsensusClient;
 use crate::codechain_machine::CodeChainMachine;
-use crate::ibc;
 use crate::snapshot_notify::NotifySender as SnapshotNotifySender;
 use crate::ChainNotify;
 use crossbeam_channel as crossbeam;
@@ -72,7 +71,6 @@ pub struct Tendermint {
     action_handlers: Vec<Arc<dyn ActionHandler>>,
     /// stake object to register client data later
     stake: Arc<stake::Stake>,
-    ibc: Arc<ibc::custom_action_handler::IBC>,
     /// Chain notify
     chain_notify: Arc<TendermintChainNotify>,
     has_signer: AtomicBool,
@@ -92,7 +90,6 @@ impl Tendermint {
     pub fn new(our_params: TendermintParams, machine: CodeChainMachine) -> Arc<Self> {
         let validators = Arc::clone(&our_params.validators);
         let stake = Arc::new(stake::Stake::new(our_params.genesis_stakes));
-        let ibc = Arc::new(ibc::custom_action_handler::IBC::new());
         let timeouts = our_params.timeouts;
         let machine = Arc::new(machine);
 
@@ -104,7 +101,7 @@ impl Tendermint {
             inner,
             quit_tendermint,
         ) = worker::spawn(our_params.validators);
-        let action_handlers: Vec<Arc<dyn ActionHandler>> = vec![stake.clone(), ibc.clone()];
+        let action_handlers: Vec<Arc<dyn ActionHandler>> = vec![stake.clone()];
         let chain_notify = Arc::new(TendermintChainNotify::new(inner.clone()));
 
         Arc::new(Tendermint {
@@ -121,7 +118,6 @@ impl Tendermint {
             machine,
             action_handlers,
             stake,
-            ibc,
             chain_notify,
             has_signer: false.into(),
         })

core/src/ibc/context.rs

@@ -14,10 +14,11 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 use super::kv_store;
-use crate::ibc::custom_action_handler::CUSTOM_ACTION_HANDLER_ID;
 use crate::ibc::KVStore;
-use cstate::{ActionDataKeyBuilder, TopLevelState, TopState, TopStateView};
+use ccrypto::blake256;
+use cstate::{TopLevelState, TopState, TopStateView};
 use primitives::H256;
+use rlp::RlpStream;
 
 pub trait Context {
     fn get_kv_store(&mut self) -> &mut dyn kv_store::KVStore;
@@ -49,8 +50,10 @@ struct TopLevelKVStore<'a> {
 
 impl<'a> TopLevelKVStore<'a> {
     fn key(path: &str) -> H256 {
-        let key_builder = ActionDataKeyBuilder::new(CUSTOM_ACTION_HANDLER_ID, 1);
-        key_builder.append(&path.as_bytes()).into_key()
+        let mut rlp = RlpStream::new_list(2);
+        rlp.append(&"IBCData");
+        rlp.append(&path);
+        blake256(rlp.drain())
     }
 }
 

core/src/ibc/custom_action_handler/actions.rs

@@ -19,9 +19,6 @@ pub mod client_02;
 #[allow(unused_variables)]
 mod commitment_23;
 pub mod context;
-#[allow(dead_code)]
-#[allow(unused_variables)]
-pub mod custom_action_handler;
 mod kv_store;
 mod transaction_handler;