Fix up contracts pallet tests (#163)

* Revert contracts put_code test to pure code (not using the macro)

* Test contract instantiate

* Fmt

Cargo.toml

@@ -19,6 +19,9 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 [features]
 client = ["substrate-subxt-client"]
 
+# enable this feature to run tests which require a local dev chain node
+integration-tests = []
+
 [dependencies]
 log = "0.4.11"
 thiserror = "1.0.20"

src/frame/contracts.rs

@@ -117,43 +117,85 @@ pub struct InstantiatedEvent<T: Contracts> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use sp_keyring::AccountKeyring;
 
-    subxt_test!({
+    use super::*;
-        name: test_put_code_and_instantiate,
+    use crate::{
-        prelude: {
+        ClientBuilder,
-            const CONTRACT: &str = r#"
+        ContractsTemplateRuntime,
-(module
+        PairSigner,
-    (func (export "call"))
+    };
-    (func (export "deploy"))
+
-)
+    fn contract_wasm() -> Vec<u8> {
-"#;
+        const CONTRACT: &str = r#"
-            let wasm = wabt::wat2wasm(CONTRACT).expect("invalid wabt");
+            (module
-            let code_hash;
+                (func (export "call"))
-        },
+                (func (export "deploy"))
-        step: {
+            )
-            call: PutCodeCall {
+        "#;
-                _runtime: PhantomData,
+        wabt::wat2wasm(CONTRACT).expect("invalid wabt")
-                code: &wasm,
+    }
-            },
+
-            event: CodeStoredEvent {
+    #[async_std::test]
-                code_hash: {
+    #[cfg(feature = "integration-tests")]
-                    code_hash = event.code_hash.clone();
+    async fn tx_put_code() {
-                    event.code_hash.clone()
+        env_logger::try_init().ok();
-                },
+
-            },
+        let signer = PairSigner::new(AccountKeyring::Alice.pair());
-        },
+        let client = ClientBuilder::<ContractsTemplateRuntime>::new()
-        step: {
+            .build()
-            call: InstantiateCall {
+            .await
-                endowment: 100_000_000_000_000,
+            .unwrap();
-                gas_limit: 500_000_000,
+
-                code_hash: &code_hash,
+        let code = contract_wasm();
-                data: &[],
+        let result = client.put_code_and_watch(&signer, &code).await.unwrap();
-            },
+        let code_stored = result.code_stored().unwrap();
-            event: InstantiatedEvent {
+
-                caller: alice.clone(),
+        assert!(
-                contract: event.contract.clone(),
+            code_stored.is_some(),
-            },
+            format!(
-        },
+                "Error calling put_code and receiving CodeStored Event: {:?}",
-    });
+                code_stored
+            )
+        );
+    }
+
+    #[async_std::test]
+    #[cfg(feature = "integration-tests")]
+    async fn tx_instantiate() {
+        env_logger::try_init().ok();
+        let signer = PairSigner::new(AccountKeyring::Bob.pair());
+        let client = ClientBuilder::<ContractsTemplateRuntime>::new()
+            .build()
+            .await
+            .unwrap();
+
+        // call put_code extrinsic
+        let code = contract_wasm();
+        let result = client.put_code_and_watch(&signer, &code).await.unwrap();
+        let code_stored = result.code_stored().unwrap();
+        let code_hash = code_stored.unwrap().code_hash;
+
+        log::info!("Code hash: {:?}", code_hash);
+
+        // call instantiate extrinsic
+        let result = client
+            .instantiate_and_watch(
+                &signer,
+                100_000_000_000_000, // endowment
+                500_000_000,         // gas_limit
+                &code_hash,
+                &[], // data
+            )
+            .await
+            .unwrap();
+
+        log::info!("Instantiate result: {:?}", result);
+        let event = result.instantiated().unwrap();
+
+        assert!(
+            event.is_some(),
+            format!("Error instantiating contract: {:?}", result)
+        );
+    }
 }

src/runtimes.rs

@@ -116,6 +116,39 @@ impl Balances for NodeTemplateRuntime {
 
 impl Sudo for NodeTemplateRuntime {}
 
+/// Concrete type definitions compatible with the node template, with the
+/// contracts pallet enabled.
+///
+/// Inherits types from [`NodeTemplateRuntime`], but adds an implementation for
+/// the contracts pallet trait.
+#[derive(Debug, Clone, Eq, PartialEq)]
+pub struct ContractsTemplateRuntime;
+
+impl Runtime for ContractsTemplateRuntime {
+    type Signature = <NodeTemplateRuntime as Runtime>::Signature;
+    type Extra = DefaultExtra<Self>;
+}
+
+impl System for ContractsTemplateRuntime {
+    type Index = <NodeTemplateRuntime as System>::Index;
+    type BlockNumber = <NodeTemplateRuntime as System>::BlockNumber;
+    type Hash = <NodeTemplateRuntime as System>::Hash;
+    type Hashing = <NodeTemplateRuntime as System>::Hashing;
+    type AccountId = <NodeTemplateRuntime as System>::AccountId;
+    type Address = <NodeTemplateRuntime as System>::Address;
+    type Header = <NodeTemplateRuntime as System>::Header;
+    type Extrinsic = <NodeTemplateRuntime as System>::Extrinsic;
+    type AccountData = <NodeTemplateRuntime as System>::AccountData;
+}
+
+impl Balances for ContractsTemplateRuntime {
+    type Balance = <NodeTemplateRuntime as Balances>::Balance;
+}
+
+impl Contracts for ContractsTemplateRuntime {}
+
+impl Sudo for ContractsTemplateRuntime {}
+
 /// Concrete type definitions compatible with those for kusama, v0.7
 ///
 /// # Note