test: add spdx-header, use runtime_metadata_url remove uneed env_var

Signed-off-by: Raymond Yeh <extraymond@gmail.com>
hyperledger · Jun 19, 2023 · fefbe78 · fefbe78
1 parent fd741a0
commit fefbe78
Show file tree

Hide file tree

Showing 26 changed files with 47 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,10 +6,6 @@ on:
   pull_request:
   workflow_dispatch:
 
-# FIXME: currently needed to bypass a transient dependency using nightly feature
-env:
- RUSTC_BOOTSTRAP: 1
-
 jobs:
   repolinter:
     name: Repolinter

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ Cargo.lock
 bundle.ll
 
 .helix/
+.vscode/
diff --git a/integration/subxt-tests/Cargo.toml b/integration/subxt-tests/Cargo.toml
@@ -2,6 +2,7 @@
 edition = "2021"
 name = "subxt-tests"
 version = "0.1.0"
+license = "Apache-2.0"
 
 [dependencies]
 anyhow = "1.0.71"

diff --git a/integration/subxt-tests/metadata.scale b/integration/subxt-tests/metadata.scale
diff --git a/integration/subxt-tests/src/cases/array_struct_mapping_storage.rs b/integration/subxt-tests/src/cases/array_struct_mapping_storage.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::{hexdisplay::AsBytesRef, U256};

diff --git a/integration/subxt-tests/src/cases/arrays.rs b/integration/subxt-tests/src/cases/arrays.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::{Contract, DeployContract, Execution, ReadContract, WriteContract, API};
 use contract_transcode::{ContractMessageTranscoder, Value};
 use hex::FromHex;

diff --git a/integration/subxt-tests/src/cases/asserts.rs b/integration/subxt-tests/src/cases/asserts.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::{node, Contract, WriteContract};
 use contract_transcode::ContractMessageTranscoder;
 use hex::FromHex;

diff --git a/integration/subxt-tests/src/cases/balances.rs b/integration/subxt-tests/src/cases/balances.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::time::Duration;
 
 use crate::{free_balance_of, node, Contract, WriteContract};

diff --git a/integration/subxt-tests/src/cases/builtins.rs b/integration/subxt-tests/src/cases/builtins.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::time::{Instant, SystemTime, UNIX_EPOCH};
 
 use crate::{node, Contract, DeployContract, Execution, ReadContract, API};

diff --git a/integration/subxt-tests/src/cases/builtins2.rs b/integration/subxt-tests/src/cases/builtins2.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::hexdisplay::AsBytesRef;

diff --git a/integration/subxt-tests/src/cases/create_contract.rs b/integration/subxt-tests/src/cases/create_contract.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::str::FromStr;
 
 use contract_transcode::ContractMessageTranscoder;

diff --git a/integration/subxt-tests/src/cases/destruct.rs b/integration/subxt-tests/src/cases/destruct.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::hexdisplay::AsBytesRef;

diff --git a/integration/subxt-tests/src/cases/events.rs b/integration/subxt-tests/src/cases/events.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Compact, Decode, Input};
 use sp_core::{crypto::AccountId32, hexdisplay::AsBytesRef};

diff --git a/integration/subxt-tests/src/cases/external_call.rs b/integration/subxt-tests/src/cases/external_call.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::{crypto::AccountId32, hexdisplay::AsBytesRef};

diff --git a/integration/subxt-tests/src/cases/flipper.rs b/integration/subxt-tests/src/cases/flipper.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::hexdisplay::AsBytesRef;

diff --git a/integration/subxt-tests/src/cases/issue666.rs b/integration/subxt-tests/src/cases/issue666.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::{Contract, API};
 
 #[tokio::test]

diff --git a/integration/subxt-tests/src/cases/mod.rs b/integration/subxt-tests/src/cases/mod.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 mod arrays;
 
 mod array_struct_mapping_storage;

diff --git a/integration/subxt-tests/src/cases/msg_sender.rs b/integration/subxt-tests/src/cases/msg_sender.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode, Input};
 use sp_core::{crypto::AccountId32, hexdisplay::AsBytesRef};

diff --git a/integration/subxt-tests/src/cases/primitives.rs b/integration/subxt-tests/src/cases/primitives.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::str::FromStr;
 
 use contract_transcode::ContractMessageTranscoder;

diff --git a/integration/subxt-tests/src/cases/randomizer.rs b/integration/subxt-tests/src/cases/randomizer.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use parity_scale_codec::{Decode, Encode};
 use sp_core::{hexdisplay::AsBytesRef, keccak_256};

diff --git a/integration/subxt-tests/src/cases/store.rs b/integration/subxt-tests/src/cases/store.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use hex::FromHex;
 use parity_scale_codec::{Decode, DecodeAll, Encode};

diff --git a/integration/subxt-tests/src/cases/structs.rs b/integration/subxt-tests/src/cases/structs.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use hex::FromHex;
 use parity_scale_codec::{Decode, DecodeAll, Encode};

diff --git a/integration/subxt-tests/src/cases/uniswapv2_erc20.rs b/integration/subxt-tests/src/cases/uniswapv2_erc20.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use hex::FromHex;
 

diff --git a/integration/subxt-tests/src/cases/uniswapv2_factory.rs b/integration/subxt-tests/src/cases/uniswapv2_factory.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 use hex::FromHex;
 use parity_scale_codec::{Decode, DecodeAll, Encode, Input};

diff --git a/integration/subxt-tests/src/cases/uniswapv2_pair.rs b/integration/subxt-tests/src/cases/uniswapv2_pair.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use std::ops::Mul;
 
 use contract_transcode::ContractMessageTranscoder;

diff --git a/integration/subxt-tests/src/lib.rs b/integration/subxt-tests/src/lib.rs
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+
 use contract_transcode::ContractMessageTranscoder;
 
 use node::runtime_types::pallet_contracts::wasm::Determinism;
@@ -24,7 +26,7 @@ mod cases;
 
 // metadata file obtained from the latest substrate-contracts-node
 #[subxt::subxt(
-    runtime_metadata_path = "./metadata.scale",
+    runtime_metadata_url = "ws://localhost:9944",
     substitute_type(
         type = "sp_weights::weight_v2::Weight",
         with = "::subxt::utils::Static<::sp_weights::Weight>"
@@ -219,14 +221,6 @@ impl Execution for ReadContract {
                 return_value: rv.result.map(|v| v.data.to_vec()).unwrap_or_default(),
             })
         }
-
-        // if rv.did_revert() {
-        //     Err(anyhow::anyhow!("reverted"))
-        // } else {
-        //     Ok(output::ReadSuccess {
-        //         return_value: rv.data.to_vec(),
-        //     })
-        // }
     }
 }
 
@@ -390,16 +384,6 @@ async fn read_call(
         &mut rv.as_bytes_ref(),
     )?;
 
-    // rv.result.map_err(|e| {
-    //     if let DispatchError::Module(m) = e {
-    //         if let Ok(d) = api.metadata().error(m.index, m.error[0]) {
-    //             return anyhow::anyhow!("{d:?}");
-    //         }
-    //     }
-
-    //     anyhow::anyhow!("{e:?}")
-    // })
-
     Ok(rv)
 }