Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove light hotspots #403

Merged
merged 1 commit into from Apr 6, 2023
Merged

Remove light hotspots #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 0 additions & 39 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ thiserror = "1.0"
prost = "0"

[dependencies]
clap = {version = "4", features = ["derive"]}
clap = {version = "4", default-features=false, features = ["derive", "help", "std", "error-context"]}
semver = "0"
config = {version="0", default-features=false, features=["toml"]}
serde = {workspace = true}
Expand Down
6 changes: 3 additions & 3 deletions src/settings.rs
View file
Open in desktop
Expand Up @@ -150,7 +150,6 @@ fn default_poc_interval() -> u64 {
#[repr(u8)]
pub enum StakingMode {
DataOnly = 0,
Light = 1,
Full = 2,
}

Expand All @@ -159,7 +158,9 @@ impl From<GatewayStakingMode> for StakingMode {
match v {
GatewayStakingMode::Dataonly => StakingMode::DataOnly,
GatewayStakingMode::Full => StakingMode::Full,
GatewayStakingMode::Light => StakingMode::Light,
// Light gateways were never implemented but were defined in staking
// modes. They're equivalent to full hotspots
GatewayStakingMode::Light => StakingMode::Full,
}
}
}
Expand All @@ -169,7 +170,6 @@ impl From<&StakingMode> for GatewayStakingMode {
match v {
StakingMode::DataOnly => GatewayStakingMode::Dataonly,
StakingMode::Full => GatewayStakingMode::Full,
StakingMode::Light => GatewayStakingMode::Light,
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions src/traits/txn_fee.rs
View file
Open in desktop
Expand Up @@ -58,9 +58,6 @@ pub struct TxnFeeConfig {
// the staking fee in DC for adding a gateway
#[serde(default = "TxnFeeConfig::default_full_staking_fee")]
staking_fee_txn_add_gateway_v1: u64,
// the staking fee in DC for adding a light gateway
#[serde(default = "TxnFeeConfig::default_light_staking_fee")]
staking_fee_txn_add_light_gateway_v1: u64,
// the staking fee in DC for adding a data only gateway
#[serde(default = "TxnFeeConfig::default_dataonly_staking_fee")]
staking_fee_txn_add_dataonly_gateway_v1: u64,
Expand All @@ -72,7 +69,6 @@ impl Default for TxnFeeConfig {
txn_fees: true,
txn_fee_multiplier: TXN_FEE_MULTIPLIER,
staking_fee_txn_add_gateway_v1: Self::default_full_staking_fee(),
staking_fee_txn_add_light_gateway_v1: Self::default_light_staking_fee(),
staking_fee_txn_add_dataonly_gateway_v1: Self::default_dataonly_staking_fee(),
}
}
Expand All @@ -87,15 +83,10 @@ impl TxnFeeConfig {
1000000
}

fn default_light_staking_fee() -> u64 {
4000000
}

pub fn get_staking_fee(&self, staking_mode: &StakingMode) -> u64 {
match staking_mode {
StakingMode::Full => self.staking_fee_txn_add_gateway_v1,
StakingMode::DataOnly => self.staking_fee_txn_add_dataonly_gateway_v1,
StakingMode::Light => self.staking_fee_txn_add_light_gateway_v1,
}
}

Expand Down