diff --git a/lib/web/rgb.ts b/lib/web/rgb.ts index 0de97bba..9a5174c2 100644 --- a/lib/web/rgb.ts +++ b/lib/web/rgb.ts @@ -555,7 +555,7 @@ export interface AcceptResponse { } export interface ContractsResponse { - /// List of avaliable contracts + /// List of available contracts contracts: ImportResponse[]; } @@ -567,7 +567,7 @@ export interface ContractHiddenResponse { } export interface InterfacesResponse { - /// List of avaliable interfaces and implementations + /// List of available interfaces and implementations interfaces: InterfaceDetail[]; } @@ -581,14 +581,14 @@ export interface InterfaceDetail { } export interface SchemasResponse { - /// List of avaliable schemas + /// List of available schemas schemas: SchemaDetail[]; } export interface SchemaDetail { /// Schema ID schema: string; - /// Avaliable Interfaces + /// Available Interfaces ifaces: string[]; } @@ -721,7 +721,7 @@ export interface RgbTransferStatusResponse { } export interface RgbTransfersResponse { - /// List of avaliable transfers + /// List of available transfers transfers: RgbTransferDetail[]; } diff --git a/src/proxy.rs b/src/proxy.rs index 1a8727eb..5afa6bec 100644 --- a/src/proxy.rs +++ b/src/proxy.rs @@ -363,11 +363,11 @@ mod client { let name = request.clone().file_name; let url = format!("{endpoint}/proxy/consignment/{network}-{name}"); let body = RgbProxyConsigCarbonadoReq::from(request); - let (reponse, _) = post_json(&url, &body.clone()) + let (response, _) = post_json(&url, &body.clone()) .await .map_err(|op| ProxyServerError::Parse(op.to_string()))?; - let result = serde_json::from_str::(&reponse) + let result = serde_json::from_str::(&response) .map_err(|op| ProxyServerError::Parse(op.to_string()))?; Ok(result.clone()) } @@ -379,11 +379,11 @@ mod client { let request_id = request_id.replace("utxob:", ""); let url = format!("{endpoint}/proxy/consignment/{request_id}"); - let reponse = get(&url, None) + let response = get(&url, None) .await .map_err(|op| ProxyServerError::Parse(op.to_string()))?; - let resp = match serde_json::from_str::(&reponse) { + let resp = match serde_json::from_str::(&response) { Ok(resp) => Some(resp), Err(_) => None, }; @@ -397,11 +397,11 @@ mod client { let endpoint = BITMASK_ENDPOINT.read().await.to_string(); let url = format!("{endpoint}/proxy/media/{attachment_id}"); - let reponse = get(&url, None) + let response = get(&url, None) .await .map_err(|op| ProxyServerError::Parse(op.to_string()))?; - let resp = match serde_json::from_str::(&reponse) { + let resp = match serde_json::from_str::(&response) { Ok(resp) => Some(resp), Err(_) => None, }; @@ -414,11 +414,11 @@ mod client { let endpoint = BITMASK_ENDPOINT.read().await.to_string(); let url = format!("{endpoint}/proxy/media-metadata/{attachment_id}"); - let reponse = get(&url, None) + let response = get(&url, None) .await .map_err(|op| ProxyServerError::Parse(op.to_string()))?; - let resp = match serde_json::from_str::(&reponse) { + let resp = match serde_json::from_str::(&response) { Ok(resp) => Some(resp), Err(_) => None, }; @@ -436,11 +436,11 @@ mod client { encode, item: media, }; - let (reponse, _) = post_json(&url, &body.clone()) + let (response, _) = post_json(&url, &body.clone()) .await .map_err(|op| ProxyServerError::Parse(op.to_string()))?; - let result = serde_json::from_str::(&reponse) + let result = serde_json::from_str::(&response) .map_err(|op| ProxyServerError::Parse(op.to_string()))?; Ok(result.clone()) } diff --git a/src/rgb.rs b/src/rgb.rs index d8c4eb48..fd54d35c 100644 --- a/src/rgb.rs +++ b/src/rgb.rs @@ -851,7 +851,7 @@ pub enum RgbSwapError { NoWatcher, /// Contract is required in this operation. Please, import or issue a Contract. NoContract, - /// Avaliable Utxo is required in this operation. {0} + /// Available Utxo is required in this operation. {0} NoUtxo(String), /// The Offer has expired. OfferExpired, diff --git a/src/rgb/prefetch.rs b/src/rgb/prefetch.rs index ea9b86b4..090b6dc7 100644 --- a/src/rgb/prefetch.rs +++ b/src/rgb/prefetch.rs @@ -127,7 +127,7 @@ pub async fn prefetch_resolver_rgb( let tx_raw = esplora_client .get_tx(transaction_id) .await - .expect("service unavaliable"); + .expect("service unavailable"); if let Some(tx) = tx_raw { let txid = @@ -191,7 +191,7 @@ pub async fn prefetch_resolver_import_rgb( let tx_raw = esplora_client .get_tx(transaction_id) .await - .expect("service unavaliable"); + .expect("service unavailable"); if let Some(tx) = tx_raw { let new_tx = Tx { @@ -235,7 +235,7 @@ pub async fn prefetch_resolver_psbt(input_utxo: &str, explorer: &mut ExplorerRes if let Some(tx) = esplora_client .get_tx(&txid) .await - .expect("service unavaliable") + .expect("service unavailable") { explorer.txs.insert(txid, tx); } @@ -351,7 +351,7 @@ pub async fn prefetch_resolver_utxos( let mut related_txs = esplora_client .scripthash_txs(&script_compatible, None) .await - .expect("Service unavaliable"); + .expect("Service unavailable"); let n_confirmed = related_txs.iter().filter(|tx| tx.status.confirmed).count(); // esplora pages on 25 confirmed transactions. If there are 25 or more we // keep requesting to see if there's more. @@ -360,7 +360,7 @@ pub async fn prefetch_resolver_utxos( let new_related_txs = esplora_client .scripthash_txs(&script_compatible, Some(related_txs.last().unwrap().txid)) .await - .expect("Service unavaliable"); + .expect("Service unavailable"); let n = new_related_txs.len(); related_txs.extend(new_related_txs); // we've reached the end @@ -424,7 +424,7 @@ pub async fn prefetch_resolver_txs(txids: Vec, explorer: &mut ExplorerReso if let Some(tx) = esplora_client .get_tx(&txid) .await - .expect("service unavaliable") + .expect("service unavailable") { explorer.txs.insert(txid, tx); } @@ -536,7 +536,7 @@ pub async fn prefetch_resolver_wutxo( if let Some(tx) = esplora_client .get_tx(&outpoint.txid) .await - .expect("service unavaliable") + .expect("service unavailable") { if let Some(vout) = tx.output.to_vec().get(outpoint.vout as usize) { let sc = Script::from_str(&vout.script_pubkey.to_hex()).expect("invalid script"); @@ -561,7 +561,7 @@ pub async fn prefetch_resolver_tx_height(txid: rgbstd::Txid, explorer: &mut Expl let tx = esplora_client .get_tx_status(transaction_id) .await - .expect("service unavaliable"); + .expect("service unavailable"); if let Some(tx) = tx { let status = match tx.block_height { @@ -707,7 +707,7 @@ impl ExploreAsyncExt { .get(&format!("{}/tx/{}", client.url(), txid)) .send() .await - .expect("unavaliable esplora server"); + .expect("unavailable esplora server"); if let StatusCode::NOT_FOUND = resp.status() { return Err(ExploreClientExtError::NotFound); diff --git a/src/rgb/psbt.rs b/src/rgb/psbt.rs index b6842907..b28ac354 100644 --- a/src/rgb/psbt.rs +++ b/src/rgb/psbt.rs @@ -66,7 +66,7 @@ pub enum CreatePsbtError { WrongAddress(AddressFormatParseError), /// PSBT file cannot be created. '{0}' Incomplete(String), - /// Invalid PSBT proprietry key. '{0}' + /// Invalid PSBT proprietary key. '{0}' WrongMetadata(ProprietaryKeyError), /// The PSBT is invalid (Unexpected behavior). Inconclusive, diff --git a/src/rgb/resolvers.rs b/src/rgb/resolvers.rs index 33727f28..a56da395 100644 --- a/src/rgb/resolvers.rs +++ b/src/rgb/resolvers.rs @@ -49,7 +49,7 @@ impl rgb::Resolver for ExplorerResolver { let mut utxos = bset![]; let explorer_client = esplora_block::Builder::new(&self.explorer_url) .build_blocking() - .expect("service unavaliable"); + .expect("service unavailable"); for (derive, script) in scripts { // TODO: Remove that after bitcoin v.30 full compatibility @@ -58,7 +58,7 @@ impl rgb::Resolver for ExplorerResolver { let mut related_txs = explorer_client .scripthash_txs(&script_compatible, None) - .expect("Service unavaliable"); + .expect("Service unavailable"); let n_confirmed = related_txs.iter().filter(|tx| tx.status.confirmed).count(); // esplora pages on 25 confirmed transactions. If there are 25 or more we // keep requesting to see if there's more. @@ -66,7 +66,7 @@ impl rgb::Resolver for ExplorerResolver { loop { let new_related_txs = explorer_client .scripthash_txs(&script_compatible, Some(related_txs.last().unwrap().txid)) - .expect("Service unavaliable"); + .expect("Service unavailable"); let n = new_related_txs.len(); related_txs.extend(new_related_txs); // we've reached the end @@ -120,9 +120,9 @@ impl ResolveTx for ExplorerResolver { ) -> Result { let explorer_client = esplora_block::Builder::new(&self.explorer_url) .build_blocking() - .expect("service unavaliable"); + .expect("service unavailable"); - match explorer_client.get_tx(&txid).expect("service unavaliable") { + match explorer_client.get_tx(&txid).expect("service unavailable") { Some(tx) => Ok(tx), _ => Err(TxResolverError { txid, err: none!() }), } @@ -146,12 +146,12 @@ impl ResolveHeight for ExplorerResolver { fn resolve_height(&mut self, txid: Txid) -> Result { let esplora_client = esplora_block::Builder::new(&self.explorer_url) .build_blocking() - .expect("service unavaliable"); + .expect("service unavailable"); let transaction_id = &bitcoin::Txid::from_str(&txid.to_hex()).expect("invalid transaction id parse"); let tx = esplora_client .get_tx_status(transaction_id) - .expect("service unavaliable"); + .expect("service unavailable"); let status = match tx.block_height { Some(height) => WitnessOrd::OnChain(WitnessHeight::new(height).unwrap()), @@ -173,13 +173,13 @@ impl ResolveCommiment for ExplorerResolver { fn resolve_tx(&self, txid: Txid) -> Result { let explorer_client = esplora_block::Builder::new(&self.explorer_url) .build_blocking() - .expect("service unavaliable"); + .expect("service unavailable"); let transaction_id = &bitcoin::Txid::from_str(&txid.to_hex()).expect("invalid transaction id parse"); let tx = explorer_client .get_tx(transaction_id) - .expect("service unavaliable"); + .expect("service unavailable"); match tx { Some(tx) => Ok(Tx { @@ -246,7 +246,7 @@ impl ResolveSpent for ExplorerResolver { ) -> Result { let explorer_client = esplora_block::Builder::new(&self.explorer_url) .build_blocking() - .expect("service unavaliable"); + .expect("service unavailable"); let block_h = if block_height { match explorer_client.get_full_tx(&txid) { diff --git a/src/rgb/structs.rs b/src/rgb/structs.rs index 2641792a..11084194 100644 --- a/src/rgb/structs.rs +++ b/src/rgb/structs.rs @@ -57,7 +57,7 @@ impl ContractAmount { /// A value ([`u64`]) combine with precision ([`u8`]), generate /// a new contract value, compabitle with rgb contract value. /// - /// Remeber: All contract amounts are represents in [`u64`]. + /// Remember: All contract amounts are represents in [`u64`]. /// The [`ContractAmount`] abstract the calculation. /// /// # Examples @@ -90,7 +90,7 @@ impl ContractAmount { /// A value ([`u64`]) combine with precision ([`u8`]), load /// a contract value, compabitle with rgb contract value. /// - /// Remeber: All contract amounts are represents in [`u64`]. + /// Remember: All contract amounts are represents in [`u64`]. /// The [`ContractAmount`] abstract the calculation. /// /// # Examples diff --git a/src/rgb/swap.rs b/src/rgb/swap.rs index bb955447..f05c7467 100644 --- a/src/rgb/swap.rs +++ b/src/rgb/swap.rs @@ -583,20 +583,20 @@ pub async fn publish_public_offer(new_offer: RgbOfferSwap) -> Result<(), RgbOffe let mut local_copy = automerge::AutoCommit::load(&doc) .map_err(|op| RgbOfferErrors::AutoMerge(op.to_string()))?; if let Some(offers) = rgb_offers.offers.get(&new_offer.contract_id) { - let mut avaliable_offers = offers.to_owned(); - if let Some(position) = avaliable_offers + let mut available_offers = offers.to_owned(); + if let Some(position) = available_offers .iter() .position(|x| x.offer_id == new_offer.offer_id) { - avaliable_offers.remove(position); - avaliable_offers.insert(position, new_offer.clone()); + available_offers.remove(position); + available_offers.insert(position, new_offer.clone()); } else { - avaliable_offers.push(new_offer.clone()); + available_offers.push(new_offer.clone()); } rgb_offers .offers - .insert(new_offer.clone().contract_id, avaliable_offers); + .insert(new_offer.clone().contract_id, available_offers); } else { rgb_offers .offers @@ -630,9 +630,9 @@ pub async fn publish_public_bid(new_bid: RgbBidSwap) -> Result<(), RgbOfferError let new_public_bid = PublicRgbBid::from(new_bid); if let Some(bids) = rgb_offers.bids.get(&offer_id) { - let mut avaliable_bids = bids.to_owned(); - avaliable_bids.insert(bid_id, new_public_bid); - rgb_offers.bids.insert(offer_id.clone(), avaliable_bids); + let mut available_bids = bids.to_owned(); + available_bids.insert(bid_id, new_public_bid); + rgb_offers.bids.insert(offer_id.clone(), available_bids); } else { rgb_offers .bids diff --git a/src/rgb/wallet.rs b/src/rgb/wallet.rs index ff971067..667ec46d 100644 --- a/src/rgb/wallet.rs +++ b/src/rgb/wallet.rs @@ -166,7 +166,7 @@ pub fn next_utxo( let index = utxo.outpoint.vout.into_u32(); let utxo_status = resolver .resolve_spent_status(txid, index.into(), true) - .expect("unavaliable service"); + .expect("unavailable service"); if !utxo_status.is_spent && !utxo_status.clone().is_invalid_state() { match utxo_status.block_height { TxStatus::Mempool => { @@ -210,7 +210,7 @@ pub fn next_utxos( let index = utxo.outpoint.vout.into_u32(); let utxo_status = resolver .resolve_spent_status(txid, index.into(), true) - .expect("unavaliable service"); + .expect("unavailable service"); if !utxo_status.is_spent && !utxo_status.is_invalid_state() && !next_utxo.contains(&utxo) { next_utxo.push(utxo); } diff --git a/src/structs.rs b/src/structs.rs index 35b1caac..22d4fccc 100644 --- a/src/structs.rs +++ b/src/structs.rs @@ -987,14 +987,14 @@ pub struct RgbTransferStatusResponse { #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase")] pub struct ContractsResponse { - /// List of avaliable contracts + /// List of available contracts pub contracts: Vec, } #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase")] pub struct InterfacesResponse { - /// List of avaliable interfaces and implementations + /// List of available interfaces and implementations pub interfaces: Vec, } @@ -1012,7 +1012,7 @@ pub struct InterfaceDetail { #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase")] pub struct SchemasResponse { - /// List of avaliable schemas + /// List of available schemas pub schemas: Vec, } @@ -1021,7 +1021,7 @@ pub struct SchemasResponse { pub struct SchemaDetail { /// Schema ID pub schema: String, - /// Avaliable Interfaces + /// Available Interfaces pub ifaces: Vec, } @@ -1224,7 +1224,7 @@ pub struct FileMetadata { #[derive(Serialize, Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase")] pub struct RgbTransfersResponse { - /// List of avaliable transfers + /// List of available transfers pub transfers: Vec, } diff --git a/tests/rgb/integration/inspect.rs b/tests/rgb/integration/inspect.rs index caeffae0..f46aa825 100644 --- a/tests/rgb/integration/inspect.rs +++ b/tests/rgb/integration/inspect.rs @@ -16,7 +16,7 @@ use rgbstd::persistence::Stock; use rgbstd::stl::LIB_ID_RGB; use strict_encoding::StrictDeserialize; -#[ignore = "Only for troubleshotting"] +#[ignore = "Only for troubleshooting"] #[tokio::test] pub async fn inspect_contract_states() -> Result<()> { // 0. Switc network diff --git a/tests/rgb/integration/states.rs b/tests/rgb/integration/states.rs index a9040e00..1a49a482 100644 --- a/tests/rgb/integration/states.rs +++ b/tests/rgb/integration/states.rs @@ -33,7 +33,7 @@ async fn allow_import_uda_contract() -> anyhow::Result<()> { #[tokio::test] async fn check_fungible_allocations() -> anyhow::Result<()> { - // 1. Issue and Generate Trasnfer (Issuer side) + // 1. Issue and Generate Transfer (Issuer side) let whatever_address = "bcrt1p76gtucrxhmn8s5622r859dpnmkj0kgfcel9xy0sz6yj84x6ppz2qk5hpsw"; let issuer_keys = new_mnemonic(&SecretString("".to_string())).await?; let owner_keys = new_mnemonic(&SecretString("".to_string())).await?; @@ -130,7 +130,7 @@ async fn check_fungible_allocations() -> anyhow::Result<()> { #[tokio::test] async fn check_uda_allocations() -> anyhow::Result<()> { - // 1. Issue and Generate Trasnfer (Issuer side) + // 1. Issue and Generate Transfer (Issuer side) let whatever_address = "bcrt1p76gtucrxhmn8s5622r859dpnmkj0kgfcel9xy0sz6yj84x6ppz2qk5hpsw"; let issuer_keys = new_mnemonic(&SecretString("".to_string())).await?; let owner_keys = new_mnemonic(&SecretString("".to_string())).await?;