Merge branch 'ordinals:master' into master

src/settings.rs

@@ -31,7 +31,7 @@ pub struct Settings {
 }
 
 impl Settings {
-  pub(crate) fn load(options: Options) -> Result<Settings> {
+  pub fn load(options: Options) -> Result<Settings> {
     let mut env = BTreeMap::<String, String>::new();
 
     for (var, value) in env::vars_os() {
@@ -57,7 +57,7 @@ impl Settings {
     Self::merge(options, env)
   }
 
-  pub(crate) fn merge(options: Options, env: BTreeMap<String, String>) -> Result<Self> {
+  pub fn merge(options: Options, env: BTreeMap<String, String>) -> Result<Self> {
     let settings = Settings::from_options(options).or(Settings::from_env(env)?);
 
     let config_path = if let Some(path) = &settings.config {
@@ -106,7 +106,7 @@ impl Settings {
     Ok(settings)
   }
 
-  pub(crate) fn or(self, source: Settings) -> Self {
+  pub fn or(self, source: Settings) -> Self {
     Self {
       bitcoin_data_dir: self.bitcoin_data_dir.or(source.bitcoin_data_dir),
       bitcoin_rpc_limit: self.bitcoin_rpc_limit.or(source.bitcoin_rpc_limit),
@@ -146,7 +146,7 @@ impl Settings {
     }
   }
 
-  pub(crate) fn from_options(options: Options) -> Self {
+  pub fn from_options(options: Options) -> Self {
     Self {
       bitcoin_data_dir: options.bitcoin_data_dir,
       bitcoin_rpc_limit: options.bitcoin_rpc_limit,
@@ -181,7 +181,7 @@ impl Settings {
     }
   }
 
-  pub(crate) fn from_env(env: BTreeMap<String, String>) -> Result<Self> {
+  pub fn from_env(env: BTreeMap<String, String>) -> Result<Self> {
     let get_bool = |key| {
       env
         .get(key)
@@ -260,7 +260,7 @@ impl Settings {
     })
   }
 
-  pub(crate) fn for_env(dir: &Path, rpc_url: &str, server_url: &str) -> Self {
+  pub fn for_env(dir: &Path, rpc_url: &str, server_url: &str) -> Self {
     Self {
       bitcoin_data_dir: Some(dir.into()),
       bitcoin_rpc_password: None,
@@ -290,7 +290,7 @@ impl Settings {
     }
   }
 
-  pub(crate) fn or_defaults(self) -> Result<Self> {
+  pub fn or_defaults(self) -> Result<Self> {
     let chain = self.chain.unwrap_or_default();
 
     let bitcoin_data_dir = match &self.bitcoin_data_dir {
@@ -370,15 +370,15 @@ impl Settings {
     })
   }
 
-  pub(crate) fn default_data_dir() -> Result<PathBuf> {
+  pub fn default_data_dir() -> Result<PathBuf> {
     Ok(
       dirs::data_dir()
         .context("could not get data dir")?
         .join("ord"),
     )
   }
 
-  pub(crate) fn bitcoin_credentials(&self) -> Result<Auth> {
+  pub fn bitcoin_credentials(&self) -> Result<Auth> {
     if let Some((user, pass)) = &self
       .bitcoin_rpc_username
       .as_ref()
@@ -390,7 +390,7 @@ impl Settings {
     }
   }
 
-  pub(crate) fn bitcoin_rpc_client(&self, wallet: Option<String>) -> Result<Client> {
+  pub fn bitcoin_rpc_client(&self, wallet: Option<String>) -> Result<Client> {
     let rpc_url = self.bitcoin_rpc_url(wallet);
 
     let bitcoin_credentials = self.bitcoin_credentials()?;
@@ -451,15 +451,15 @@ impl Settings {
     Ok(client)
   }
 
-  pub(crate) fn chain(&self) -> Chain {
+  pub fn chain(&self) -> Chain {
     self.chain.unwrap()
   }
 
-  pub(crate) fn commit_interval(&self) -> usize {
+  pub fn commit_interval(&self) -> usize {
     self.commit_interval.unwrap()
   }
 
-  pub(crate) fn cookie_file(&self) -> Result<PathBuf> {
+  pub fn cookie_file(&self) -> Result<PathBuf> {
     if let Some(cookie_file) = &self.cookie_file {
       return Ok(cookie_file.clone());
     }
@@ -481,86 +481,86 @@ impl Settings {
     Ok(path.join(".cookie"))
   }
 
-  pub(crate) fn credentials(&self) -> Option<(&str, &str)> {
+  pub fn credentials(&self) -> Option<(&str, &str)> {
     self
       .server_username
       .as_deref()
       .zip(self.server_password.as_deref())
   }
 
-  pub(crate) fn data_dir(&self) -> PathBuf {
+  pub fn data_dir(&self) -> PathBuf {
     self.data_dir.as_ref().unwrap().into()
   }
 
-  pub(crate) fn first_inscription_height(&self) -> u32 {
+  pub fn first_inscription_height(&self) -> u32 {
     self.first_inscription_height.unwrap()
   }
 
-  pub(crate) fn first_rune_height(&self) -> u32 {
+  pub fn first_rune_height(&self) -> u32 {
     if self.integration_test {
       0
     } else {
       self.chain.unwrap().first_rune_height()
     }
   }
 
-  pub(crate) fn height_limit(&self) -> Option<u32> {
+  pub fn height_limit(&self) -> Option<u32> {
     self.height_limit
   }
 
-  pub(crate) fn index(&self) -> &Path {
+  pub fn index(&self) -> &Path {
     self.index.as_ref().unwrap()
   }
 
-  pub(crate) fn index_inscriptions(&self) -> bool {
+  pub fn index_inscriptions(&self) -> bool {
     !self.no_index_inscriptions
   }
 
-  pub(crate) fn index_runes(&self) -> bool {
+  pub fn index_runes(&self) -> bool {
     self.index_runes
   }
 
-  pub(crate) fn index_cache_size(&self) -> usize {
+  pub fn index_cache_size(&self) -> usize {
     self.index_cache_size.unwrap()
   }
 
-  pub(crate) fn index_sats(&self) -> bool {
+  pub fn index_sats(&self) -> bool {
     self.index_sats
   }
 
-  pub(crate) fn index_spent_sats(&self) -> bool {
+  pub fn index_spent_sats(&self) -> bool {
     self.index_spent_sats
   }
 
-  pub(crate) fn index_transactions(&self) -> bool {
+  pub fn index_transactions(&self) -> bool {
     self.index_transactions
   }
 
-  pub(crate) fn integration_test(&self) -> bool {
+  pub fn integration_test(&self) -> bool {
     self.integration_test
   }
 
-  pub(crate) fn is_hidden(&self, inscription_id: InscriptionId) -> bool {
+  pub fn is_hidden(&self, inscription_id: InscriptionId) -> bool {
     self
       .hidden
       .as_ref()
       .map(|hidden| hidden.contains(&inscription_id))
       .unwrap_or_default()
   }
 
-  pub(crate) fn bitcoin_rpc_url(&self, wallet_name: Option<String>) -> String {
+  pub fn bitcoin_rpc_url(&self, wallet_name: Option<String>) -> String {
     let base_url = self.bitcoin_rpc_url.as_ref().unwrap();
     match wallet_name {
       Some(wallet_name) => format!("{base_url}/wallet/{wallet_name}"),
       None => format!("{base_url}/"),
     }
   }
 
-  pub(crate) fn bitcoin_rpc_limit(&self) -> u32 {
+  pub fn bitcoin_rpc_limit(&self) -> u32 {
     self.bitcoin_rpc_limit.unwrap()
   }
 
-  pub(crate) fn server_url(&self) -> Option<&str> {
+  pub fn server_url(&self) -> Option<&str> {
     self.server_url.as_deref()
   }
 }