Switch from Rc to Arc (#120)

Author: obrok

Cargo.lock

@@ -18,7 +18,7 @@ homepage = "https://github.com/Cardinal-Cryptography/drink"
 license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/Cardinal-Cryptography/drink"
-version = "0.15.0"
+version = "0.16.0"
 
 [workspace.dependencies]
 anyhow = { version = "1.0.71" }
@@ -51,5 +51,5 @@ sp-runtime-interface = { version = "26.0.0" }
 
 # Local dependencies
 
-drink = { version = "=0.15.0", path = "drink" }
-drink-test-macro = { version = "=0.15.0", path = "drink/test-macro" }
+drink = { version = "=0.16.0", path = "drink" }
+drink-test-macro = { version = "=0.16.0", path = "drink/test-macro" }

Cargo.toml

@@ -1,4 +1,4 @@
-use std::{path::PathBuf, rc::Rc};
+use std::{path::PathBuf, sync::Arc};
 
 use contract_transcode::ContractMessageTranscoder;
 use drink::AccountId32;
@@ -10,7 +10,7 @@ pub struct Contract {
     pub name: String,
     pub address: AccountId32,
     pub base_path: PathBuf,
-    pub transcoder: Rc<ContractMessageTranscoder>,
+    pub transcoder: Arc<ContractMessageTranscoder>,
 }
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Default)]

drink-cli/src/app_state/contracts.rs

@@ -1,7 +1,7 @@
 use std::{
     fs,
     path::{Path, PathBuf},
-    rc::Rc,
+    sync::Arc,
 };
 
 use contract_build::{BuildMode, ExecuteArgs, ManifestPath, OptimizationPasses, Verbosity};
@@ -71,7 +71,7 @@ pub fn deploy(app_state: &mut AppState, constructor: String, args: Vec<String>,
         app_state.print_error("Failed to create transcoder from metadata file.");
         return;
     };
-    let transcoder = Rc::new(transcoder);
+    let transcoder = Arc::new(transcoder);
 
     match app_state.session.deploy(
         contract_bytes,

drink-cli/src/executor/contract.rs

@@ -3,7 +3,6 @@
 use std::{
     fmt::Debug,
     mem,
-    rc::Rc,
     sync::{Arc, Mutex},
 };
 
@@ -63,7 +62,7 @@ pub const NO_ENDOWMENT: Option<BalanceOf<MinimalSandboxRuntime>> = None;
 ///
 /// `Session` has two APIs: chain-ish and for singular actions. The first one can be used like:
 /// ```rust, no_run
-/// # use std::rc::Rc;
+/// # use std::sync::Arc;
 /// # use contract_transcode::ContractMessageTranscoder;
 /// # use ink_sandbox::AccountId32;
 /// # use drink::{
@@ -72,8 +71,8 @@ pub const NO_ENDOWMENT: Option<BalanceOf<MinimalSandboxRuntime>> = None;
 /// #   minimal::MinimalSandbox
 /// # };
 /// #
-/// # fn get_transcoder() -> Rc<ContractMessageTranscoder> {
-/// #   Rc::new(ContractMessageTranscoder::load("").unwrap())
+/// # fn get_transcoder() -> Arc<ContractMessageTranscoder> {
+/// #   Arc::new(ContractMessageTranscoder::load("").unwrap())
 /// # }
 /// # fn contract_bytes() -> Vec<u8> { vec![] }
 /// # fn bob() -> AccountId32 { AccountId32::new([0; 32]) }
@@ -90,16 +89,16 @@ pub const NO_ENDOWMENT: Option<BalanceOf<MinimalSandboxRuntime>> = None;
 ///
 /// The second one serves for one-at-a-time actions:
 /// ```rust, no_run
-/// # use std::rc::Rc;
+/// # use std::sync::Arc;
 /// # use contract_transcode::ContractMessageTranscoder;
 /// # use ink_sandbox::AccountId32;
 /// # use drink::{
 /// #   session::Session,
 /// #   minimal::MinimalSandbox,
 /// #   session::{NO_ARGS, NO_ENDOWMENT, NO_SALT}
 /// # };
-/// # fn get_transcoder() -> Rc<ContractMessageTranscoder> {
-/// #   Rc::new(ContractMessageTranscoder::load("").unwrap())
+/// # fn get_transcoder() -> Arc<ContractMessageTranscoder> {
+/// #   Arc::new(ContractMessageTranscoder::load("").unwrap())
 /// # }
 /// # fn contract_bytes() -> Vec<u8> { vec![] }
 /// # fn bob() -> AccountId32 { AccountId32::new([0; 32]) }
@@ -224,7 +223,7 @@ where
     pub fn with_transcoder(
         mut self,
         contract_address: AccountIdFor<T::Runtime>,
-        transcoder: &Rc<ContractMessageTranscoder>,
+        transcoder: &Arc<ContractMessageTranscoder>,
     ) -> Self {
         self.set_transcoder(contract_address, transcoder);
         self
@@ -234,7 +233,7 @@ where
     pub fn set_transcoder(
         &mut self,
         contract_address: AccountIdFor<T::Runtime>,
-        transcoder: &Rc<ContractMessageTranscoder>,
+        transcoder: &Arc<ContractMessageTranscoder>,
     ) {
         self.transcoders.register(contract_address, transcoder);
     }
@@ -263,7 +262,7 @@ where
         args: &[S],
         salt: Vec<u8>,
         endowment: Option<BalanceOf<T::Runtime>>,
-        transcoder: &Rc<ContractMessageTranscoder>,
+        transcoder: &Arc<ContractMessageTranscoder>,
     ) -> Result<Self, SessionError> {
         self.deploy(
             contract_bytes,
@@ -292,7 +291,7 @@ where
         args: &[S],
         salt: Vec<u8>,
         endowment: Option<BalanceOf<T::Runtime>>,
-        transcoder: &Rc<ContractMessageTranscoder>,
+        transcoder: &Arc<ContractMessageTranscoder>,
     ) -> Result<AccountIdFor<T::Runtime>, SessionError> {
         let data = transcoder
             .encode(constructor, args)

drink/src/session.rs

@@ -1,6 +1,6 @@
 //! This module provides simple utilities for loading and parsing `.contract` files in context of `drink` tests.
 
-use std::{path::PathBuf, rc::Rc};
+use std::{path::PathBuf, sync::Arc};
 
 use contract_metadata::ContractMetadata;
 use contract_transcode::ContractMessageTranscoder;
@@ -19,7 +19,7 @@ pub struct ContractBundle {
     /// WASM blob of the contract
     pub wasm: Vec<u8>,
     /// Transcoder derived from the ABI/metadata
-    pub transcoder: Rc<ContractMessageTranscoder>,
+    pub transcoder: Arc<ContractMessageTranscoder>,
 }
 
 impl ContractBundle {
@@ -40,7 +40,7 @@ impl ContractBundle {
                 ))
             })?;
 
-        let transcoder = Rc::new(ContractMessageTranscoder::new(ink_metadata));
+        let transcoder = Arc::new(ContractMessageTranscoder::new(ink_metadata));
 
         let wasm = metadata
             .source

drink/src/session/bundle.rs

@@ -1,4 +1,4 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
 use contract_transcode::{ContractMessageTranscoder, Value};
 use frame_system::Config as SysConfig;
@@ -176,7 +176,7 @@ impl EventBatch<MinimalSandboxRuntime> {
     /// **WARNING 2**: This method will ignore anonymous events.
     pub fn contract_events_decoded(
         &self,
-        transcoder: &Rc<ContractMessageTranscoder>,
+        transcoder: &Arc<ContractMessageTranscoder>,
     ) -> Vec<Value> {
         let signature_topics = transcoder
             .metadata()

drink/src/session/record.rs

@@ -1,9 +1,9 @@
-use std::{collections::BTreeMap, rc::Rc};
+use std::{collections::BTreeMap, sync::Arc};
 
 use contract_transcode::ContractMessageTranscoder;
 
 pub struct TranscoderRegistry<Contract: Ord> {
-    transcoders: BTreeMap<Contract, Rc<ContractMessageTranscoder>>,
+    transcoders: BTreeMap<Contract, Arc<ContractMessageTranscoder>>,
 }
 
 impl<Contract: Ord> TranscoderRegistry<Contract> {
@@ -13,11 +13,11 @@ impl<Contract: Ord> TranscoderRegistry<Contract> {
         }
     }
 
-    pub fn register(&mut self, contract: Contract, transcoder: &Rc<ContractMessageTranscoder>) {
-        self.transcoders.insert(contract, Rc::clone(transcoder));
+    pub fn register(&mut self, contract: Contract, transcoder: &Arc<ContractMessageTranscoder>) {
+        self.transcoders.insert(contract, Arc::clone(transcoder));
     }
 
-    pub fn get(&self, contract: &Contract) -> Option<Rc<ContractMessageTranscoder>> {
-        self.transcoders.get(contract).map(Rc::clone)
+    pub fn get(&self, contract: &Contract) -> Option<Arc<ContractMessageTranscoder>> {
+        self.transcoders.get(contract).map(Arc::clone)
     }
 }