mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-13 15:11:03 +00:00
Update and fix wasm code again, add cli check to .gitlab-ci.yml (#917)
* Add cli to wasm tests, update and bring closer to the substrate browser code * Remove ws.js * Update cli/src/browser.rs Co-Authored-By: Pierre Krieger <pierre.krieger1708@gmail.com> * Update browser.rs Co-authored-by: Gavin Wood <gavin@parity.io> Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
This commit is contained in:
+16
-26
@@ -14,50 +14,40 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
use crate::ChainSpec;
|
||||
use log::info;
|
||||
use wasm_bindgen::prelude::*;
|
||||
use service::IsKusama;
|
||||
use browser_utils::{
|
||||
Client,
|
||||
browser_configuration, set_console_error_panic_hook, init_console_log,
|
||||
};
|
||||
use std::str::FromStr;
|
||||
|
||||
/// Starts the client.
|
||||
///
|
||||
/// You must pass a libp2p transport that supports .
|
||||
#[wasm_bindgen]
|
||||
pub async fn start_client(chain_spec: String, wasm_ext: browser_utils::Transport) -> Result<browser_utils::Client, JsValue> {
|
||||
start_inner(chain_spec, wasm_ext)
|
||||
pub async fn start_client(chain_spec: String, log_level: String) -> Result<Client, JsValue> {
|
||||
start_inner(chain_spec, log_level)
|
||||
.await
|
||||
.map_err(|err| JsValue::from_str(&err.to_string()))
|
||||
}
|
||||
|
||||
async fn start_inner(chain_spec: String, wasm_ext: browser_utils::Transport) -> Result<browser_utils::Client, Box<dyn std::error::Error>> {
|
||||
browser_utils::set_console_error_panic_hook();
|
||||
browser_utils::init_console_log(log::Level::Info)?;
|
||||
async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
|
||||
set_console_error_panic_hook();
|
||||
init_console_log(log_level.parse()?)?;
|
||||
|
||||
let chain_spec = ChainSpec::from(&chain_spec)
|
||||
.ok_or_else(|| format!("Chain spec: {:?} doesn't exist.", chain_spec))?
|
||||
.load()
|
||||
let chain_spec = service::PolkadotChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
|
||||
.map_err(|e| format!("{:?}", e))?;
|
||||
let config = browser_utils::browser_configuration(wasm_ext, chain_spec)
|
||||
.await?;
|
||||
let config = browser_configuration(chain_spec).await?;
|
||||
|
||||
info!("Polkadot browser node");
|
||||
info!(" version {}", config.full_version());
|
||||
info!(" by Parity Technologies, 2017-2019");
|
||||
if let Some(chain_spec) = &config.chain_spec {
|
||||
info!("Chain specification: {}", chain_spec.name());
|
||||
if chain_spec.is_kusama() {
|
||||
info!("----------------------------");
|
||||
info!("This chain is not in any way");
|
||||
info!(" endorsed by the ");
|
||||
info!(" KUSAMA FOUNDATION ");
|
||||
info!("----------------------------");
|
||||
}
|
||||
}
|
||||
info!(" by Parity Technologies, 2017-2020");
|
||||
info!("Chain specification: {}", config.expect_chain_spec().name());
|
||||
info!("Node name: {}", config.name);
|
||||
info!("Roles: {:?}", config.roles);
|
||||
|
||||
// Create the service. This is the most heavy initialization step.
|
||||
let service = service::kusama_new_light(config).map_err(|e| format!("{:?}", e))?;
|
||||
let service = service::kusama_new_light(config)
|
||||
.map_err(|e| format!("{:?}", e))?;
|
||||
|
||||
Ok(browser_utils::start_client(service))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user