Skip to content

Commit a55da1e

Browse files
jferrantjferrant
authored
Merge pull request #5625 from stacks-network/fix/clippy-ci-stacks-lib-redundant-static-lifetimes
Fix all redundant-static-lifetimes clippy warnings
2 parents 5178a46 + 68b7c3f commit a55da1e

File tree

24 files changed

+127
-128
lines changed

24 files changed

+127
-128
lines changed

‎stacks-common/src/util/macros.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ macro_rules! define_named_enum {
4747
$($Variant),*,
4848
}
4949
impl $Name {
50-
pub const ALL: &'static [$Name] = &[$($Name::$Variant),*];
51-
pub const ALL_NAMES: &'static [&'static str] = &[$($VarName),*];
50+
pub const ALL: &[$Name] = &[$($Name::$Variant),*];
51+
pub const ALL_NAMES: &[&str] = &[$($VarName),*];
5252

5353
pub fn lookup_by_name(name: &str) -> Option<Self> {
5454
match name {
@@ -113,8 +113,8 @@ macro_rules! define_versioned_named_enum_internal {
113113
}
114114

115115
impl $Name {
116-
pub const ALL: &'static [$Name] = &[$($Name::$Variant),*];
117-
pub const ALL_NAMES: &'static [&'static str] = &[$($VarName),*];
116+
pub const ALL: &[$Name] = &[$($Name::$Variant),*];
117+
pub const ALL_NAMES: &[&str] = &[$($VarName),*];
118118

119119
pub fn lookup_by_name(name: &str) -> Option<Self> {
120120
match name {

‎stackslib/src/burnchains/bitcoin/address.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ pub const ADDRESS_VERSION_TESTNET_SINGLESIG: u8 = 111;
7979
pub const ADDRESS_VERSION_TESTNET_MULTISIG: u8 = 196;
8080

8181
// segwit hrps
82-
pub const SEGWIT_MAINNET_HRP: &'static str = "bc";
83-
pub const SEGWIT_TESTNET_HRP: &'static str = "tb";
82+
pub const SEGWIT_MAINNET_HRP: &str = "bc";
83+
pub const SEGWIT_TESTNET_HRP: &str = "tb";
8484

8585
// segwit witnes versions
8686
pub const SEGWIT_V0: u8 = 0;

‎stackslib/src/burnchains/bitcoin/indexer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ use crate::core::{
5050
};
5151
use crate::util_lib::db::Error as DBError;
5252

53-
pub const USER_AGENT: &'static str = "Stacks/2.1";
53+
pub const USER_AGENT: &str = "Stacks/2.1";
5454

5555
pub const BITCOIN_MAINNET: u32 = 0xD9B4BEF9;
5656
pub const BITCOIN_TESTNET: u32 = 0x0709110B;
5757
pub const BITCOIN_REGTEST: u32 = 0xDAB5BFFA;
5858

59-
pub const BITCOIN_MAINNET_NAME: &'static str = "mainnet";
60-
pub const BITCOIN_TESTNET_NAME: &'static str = "testnet";
61-
pub const BITCOIN_REGTEST_NAME: &'static str = "regtest";
59+
pub const BITCOIN_MAINNET_NAME: &str = "mainnet";
60+
pub const BITCOIN_TESTNET_NAME: &str = "testnet";
61+
pub const BITCOIN_REGTEST_NAME: &str = "regtest";
6262

6363
// batch size for searching for a reorg
6464
// kept small since sometimes bitcoin will just send us one header at a time

‎stackslib/src/burnchains/bitcoin/spv.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ use crate::util_lib::db::{
4646

4747
const BLOCK_HEADER_SIZE: u64 = 81;
4848

49-
pub const BITCOIN_GENESIS_BLOCK_HASH_MAINNET: &'static str =
49+
pub const BITCOIN_GENESIS_BLOCK_HASH_MAINNET: &str =
5050
"000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f";
51-
pub const BITCOIN_GENESIS_BLOCK_MERKLE_ROOT_MAINNET: &'static str =
51+
pub const BITCOIN_GENESIS_BLOCK_MERKLE_ROOT_MAINNET: &str =
5252
"4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b";
5353

54-
pub const BITCOIN_GENESIS_BLOCK_HASH_TESTNET: &'static str =
54+
pub const BITCOIN_GENESIS_BLOCK_HASH_TESTNET: &str =
5555
"000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943";
5656

57-
pub const BITCOIN_GENESIS_BLOCK_HASH_REGTEST: &'static str =
57+
pub const BITCOIN_GENESIS_BLOCK_HASH_REGTEST: &str =
5858
"0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206";
5959

6060
pub const BLOCK_DIFFICULTY_CHUNK_SIZE: u64 = 2016;
6161
const BLOCK_DIFFICULTY_INTERVAL: u32 = 14 * 24 * 60 * 60; // two weeks, in seconds
6262

63-
pub const SPV_DB_VERSION: &'static str = "3";
63+
pub const SPV_DB_VERSION: &str = "3";
6464

65-
const SPV_INITIAL_SCHEMA: &[&'static str] = &[
65+
const SPV_INITIAL_SCHEMA: &[&str] = &[
6666
r#"
6767
CREATE TABLE headers(
6868
version INTEGER NOT NULL,
@@ -81,15 +81,15 @@ const SPV_INITIAL_SCHEMA: &[&'static str] = &[
8181
// unlike the `headers` table, this table will never be deleted from, since we use it to determine
8282
// whether or not newly-arrived headers represent a better chain than the best-known chain. The
8383
// only way to _replace_ a row is to find a header difficulty interval with a _higher_ work score.
84-
const SPV_SCHEMA_2: &[&'static str] = &[r#"
84+
const SPV_SCHEMA_2: &[&str] = &[r#"
8585
CREATE TABLE chain_work(
8686
interval INTEGER PRIMARY KEY,
8787
work TEXT NOT NULL -- 32-byte (256-bit) integer
8888
);
8989
"#];
9090

9191
// force the node to go and store the burnchain block header hash as well
92-
const SPV_SCHEMA_3: &[&'static str] = &[
92+
const SPV_SCHEMA_3: &[&str] = &[
9393
r#"
9494
DROP TABLE headers;
9595
"#,

‎stackslib/src/burnchains/db.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ impl FromRow<BlockstackOperationType> for BlockstackOperationType {
207207
}
208208
}
209209

210-
pub const BURNCHAIN_DB_VERSION: &'static str = "2";
210+
pub const BURNCHAIN_DB_VERSION: &str = "2";
211211

212-
const BURNCHAIN_DB_SCHEMA: &'static str = r#"
212+
const BURNCHAIN_DB_SCHEMA: &str = r#"
213213
CREATE TABLE burnchain_db_block_headers (
214214
-- height of the block (non-negative)
215215
block_height INTEGER NOT NULL,
@@ -299,9 +299,8 @@ CREATE TABLE db_config(version TEXT NOT NULL);
299299
INSERT INTO affirmation_maps(affirmation_id,weight,affirmation_map) VALUES (0,0,"");
300300
"#;
301301

302-
const LAST_BURNCHAIN_DB_INDEX: &'static str =
303-
"index_block_commit_metadata_burn_block_hash_anchor_block";
304-
const BURNCHAIN_DB_INDEXES: &'static [&'static str] = &[
302+
const LAST_BURNCHAIN_DB_INDEX: &str = "index_block_commit_metadata_burn_block_hash_anchor_block";
303+
const BURNCHAIN_DB_INDEXES: &[&str] = &[
305304
"CREATE INDEX IF NOT EXISTS index_burnchain_db_block_headers_height_hash ON burnchain_db_block_headers(block_height DESC, block_hash ASC);",
306305
"CREATE INDEX IF NOT EXISTS index_burnchain_db_block_hash ON burnchain_db_block_ops(block_hash);",
307306
"CREATE INDEX IF NOT EXISTS index_burnchain_db_txid ON burnchain_db_block_ops(txid);",

‎stackslib/src/chainstate/burn/db/sortdb.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,9 @@ impl FromRow<StacksEpoch> for StacksEpoch {
515515
}
516516
}
517517

518-
pub const SORTITION_DB_VERSION: &'static str = "9";
518+
pub const SORTITION_DB_VERSION: &str = "9";
519519

520-
const SORTITION_DB_INITIAL_SCHEMA: &'static [&'static str] = &[
520+
const SORTITION_DB_INITIAL_SCHEMA: &[&str] = &[
521521
r#"
522522
PRAGMA foreign_keys = ON;
523523
"#,
@@ -652,7 +652,7 @@ const SORTITION_DB_INITIAL_SCHEMA: &'static [&'static str] = &[
652652
"CREATE TABLE db_config(version TEXT PRIMARY KEY);",
653653
];
654654

655-
const SORTITION_DB_SCHEMA_2: &'static [&'static str] = &[r#"
655+
const SORTITION_DB_SCHEMA_2: &[&str] = &[r#"
656656
CREATE TABLE epochs (
657657
start_block_height INTEGER NOT NULL,
658658
end_block_height INTEGER NOT NULL,
@@ -662,7 +662,7 @@ const SORTITION_DB_SCHEMA_2: &'static [&'static str] = &[r#"
662662
PRIMARY KEY(start_block_height,epoch_id)
663663
);"#];
664664

665-
const SORTITION_DB_SCHEMA_3: &'static [&'static str] = &[r#"
665+
const SORTITION_DB_SCHEMA_3: &[&str] = &[r#"
666666
CREATE TABLE block_commit_parents (
667667
block_commit_txid TEXT NOT NULL,
668668
block_commit_sortition_id TEXT NOT NULL,
@@ -673,7 +673,7 @@ const SORTITION_DB_SCHEMA_3: &'static [&'static str] = &[r#"
673673
FOREIGN KEY(block_commit_txid,block_commit_sortition_id) REFERENCES block_commits(txid,sortition_id)
674674
);"#];
675675

676-
const SORTITION_DB_SCHEMA_4: &'static [&'static str] = &[
676+
const SORTITION_DB_SCHEMA_4: &[&str] = &[
677677
r#"
678678
CREATE TABLE delegate_stx (
679679
txid TEXT NOT NULL,
@@ -698,16 +698,16 @@ const SORTITION_DB_SCHEMA_4: &'static [&'static str] = &[
698698

699699
/// The changes for version five *just* replace the existing epochs table
700700
/// by deleting all the current entries and inserting the new epochs definition.
701-
const SORTITION_DB_SCHEMA_5: &'static [&'static str] = &[r#"
701+
const SORTITION_DB_SCHEMA_5: &[&str] = &[r#"
702702
DELETE FROM epochs;"#];
703703

704-
const SORTITION_DB_SCHEMA_6: &'static [&'static str] = &[r#"
704+
const SORTITION_DB_SCHEMA_6: &[&str] = &[r#"
705705
DELETE FROM epochs;"#];
706706

707-
const SORTITION_DB_SCHEMA_7: &'static [&'static str] = &[r#"
707+
const SORTITION_DB_SCHEMA_7: &[&str] = &[r#"
708708
DELETE FROM epochs;"#];
709709

710-
const SORTITION_DB_SCHEMA_8: &'static [&'static str] = &[
710+
const SORTITION_DB_SCHEMA_8: &[&str] = &[
711711
r#"DELETE FROM epochs;"#,
712712
r#"DROP INDEX IF EXISTS index_user_burn_support_txid;"#,
713713
r#"DROP INDEX IF EXISTS index_user_burn_support_sortition_id_vtxindex;"#,
@@ -751,11 +751,11 @@ const SORTITION_DB_SCHEMA_8: &'static [&'static str] = &[
751751
);"#,
752752
];
753753

754-
static SORTITION_DB_SCHEMA_9: &[&'static str] =
754+
static SORTITION_DB_SCHEMA_9: &[&str] =
755755
&[r#"ALTER TABLE block_commits ADD punished TEXT DEFAULT NULL;"#];
756756

757-
const LAST_SORTITION_DB_INDEX: &'static str = "index_block_commits_by_sender";
758-
const SORTITION_DB_INDEXES: &'static [&'static str] = &[
757+
const LAST_SORTITION_DB_INDEX: &str = "index_block_commits_by_sender";
758+
const SORTITION_DB_INDEXES: &[&str] = &[
759759
"CREATE INDEX IF NOT EXISTS snapshots_block_hashes ON snapshots(block_height,index_root,winning_stacks_block_hash);",
760760
"CREATE INDEX IF NOT EXISTS snapshots_block_stacks_hashes ON snapshots(num_sortitions,index_root,winning_stacks_block_hash);",
761761
"CREATE INDEX IF NOT EXISTS snapshots_block_heights ON snapshots(burn_header_hash,block_height);",

‎stackslib/src/chainstate/burn/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,17 @@ impl SortitionHash {
183183
}
184184

185185
impl Opcodes {
186-
const HTTP_BLOCK_COMMIT: &'static str = "block_commit";
187-
const HTTP_KEY_REGISTER: &'static str = "key_register";
188-
const HTTP_BURN_SUPPORT: &'static str = "burn_support";
189-
const HTTP_STACK_STX: &'static str = "stack_stx";
190-
const HTTP_PRE_STX: &'static str = "pre_stx";
191-
const HTTP_TRANSFER_STX: &'static str = "transfer_stx";
192-
const HTTP_DELEGATE_STX: &'static str = "delegate_stx";
193-
const HTTP_PEG_IN: &'static str = "peg_in";
194-
const HTTP_PEG_OUT_REQUEST: &'static str = "peg_out_request";
195-
const HTTP_PEG_OUT_FULFILL: &'static str = "peg_out_fulfill";
196-
const HTTP_VOTE_FOR_AGGREGATE_KEY: &'static str = "vote_for_aggregate_key";
186+
const HTTP_BLOCK_COMMIT: &str = "block_commit";
187+
const HTTP_KEY_REGISTER: &str = "key_register";
188+
const HTTP_BURN_SUPPORT: &str = "burn_support";
189+
const HTTP_STACK_STX: &str = "stack_stx";
190+
const HTTP_PRE_STX: &str = "pre_stx";
191+
const HTTP_TRANSFER_STX: &str = "transfer_stx";
192+
const HTTP_DELEGATE_STX: &str = "delegate_stx";
193+
const HTTP_PEG_IN: &str = "peg_in";
194+
const HTTP_PEG_OUT_REQUEST: &str = "peg_out_request";
195+
const HTTP_PEG_OUT_FULFILL: &str = "peg_out_fulfill";
196+
const HTTP_VOTE_FOR_AGGREGATE_KEY: &str = "vote_for_aggregate_key";
197197

198198
pub fn to_http_str(&self) -> &'static str {
199199
match self {

‎stackslib/src/chainstate/nakamoto/staging_blocks.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl fmt::Display for NakamotoBlockObtainMethod {
5959
}
6060
}
6161

62-
pub const NAKAMOTO_STAGING_DB_SCHEMA_1: &'static [&'static str] = &[
62+
pub const NAKAMOTO_STAGING_DB_SCHEMA_1: &[&str] = &[
6363
r#"
6464
-- Table for staging nakamoto blocks
6565
CREATE TABLE nakamoto_staging_blocks (
@@ -102,7 +102,7 @@ pub const NAKAMOTO_STAGING_DB_SCHEMA_1: &'static [&'static str] = &[
102102
r#"CREATE INDEX nakamoto_staging_blocks_by_tenure_start_block ON nakamoto_staging_blocks(is_tenure_start,consensus_hash);"#,
103103
];
104104

105-
pub const NAKAMOTO_STAGING_DB_SCHEMA_2: &'static [&'static str] = &[
105+
pub const NAKAMOTO_STAGING_DB_SCHEMA_2: &[&str] = &[
106106
r#"
107107
DROP TABLE nakamoto_staging_blocks;
108108
"#,
@@ -155,7 +155,7 @@ pub const NAKAMOTO_STAGING_DB_SCHEMA_2: &'static [&'static str] = &[
155155
r#"INSERT INTO db_version (version) VALUES (2)"#,
156156
];
157157

158-
pub const NAKAMOTO_STAGING_DB_SCHEMA_3: &'static [&'static str] = &[
158+
pub const NAKAMOTO_STAGING_DB_SCHEMA_3: &[&str] = &[
159159
r#"CREATE INDEX nakamoto_staging_blocks_by_obtain_method ON nakamoto_staging_blocks(consensus_hash,obtain_method);"#,
160160
r#"UPDATE db_version SET version = 3"#,
161161
];

‎stackslib/src/chainstate/nakamoto/tenure.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ use crate::util_lib::db::{
120120
FromRow,
121121
};
122122

123-
pub static NAKAMOTO_TENURES_SCHEMA_1: &'static str = r#"
123+
pub static NAKAMOTO_TENURES_SCHEMA_1: &str = r#"
124124
CREATE TABLE nakamoto_tenures (
125125
-- consensus hash of start-tenure block (i.e. the consensus hash of the sortition in which the miner's block-commit
126126
-- was mined)
@@ -157,7 +157,7 @@ pub static NAKAMOTO_TENURES_SCHEMA_1: &'static str = r#"
157157
CREATE INDEX nakamoto_tenures_by_parent ON nakamoto_tenures(tenure_id_consensus_hash,prev_tenure_id_consensus_hash);
158158
"#;
159159

160-
pub static NAKAMOTO_TENURES_SCHEMA_2: &'static str = r#"
160+
pub static NAKAMOTO_TENURES_SCHEMA_2: &str = r#"
161161
-- Drop the nakamoto_tenures table if it exists
162162
DROP TABLE IF EXISTS nakamoto_tenures;
163163
@@ -197,7 +197,7 @@ pub static NAKAMOTO_TENURES_SCHEMA_2: &'static str = r#"
197197
CREATE INDEX nakamoto_tenures_by_parent ON nakamoto_tenures(tenure_id_consensus_hash,prev_tenure_id_consensus_hash);
198198
"#;
199199

200-
pub static NAKAMOTO_TENURES_SCHEMA_3: &'static str = r#"
200+
pub static NAKAMOTO_TENURES_SCHEMA_3: &str = r#"
201201
-- Drop the nakamoto_tenures table if it exists
202202
DROP TABLE IF EXISTS nakamoto_tenures;
203203

‎stackslib/src/chainstate/stacks/boot/mod.rs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -61,48 +61,48 @@ use crate::core::{
6161
use crate::util_lib::boot;
6262
use crate::util_lib::strings::VecDisplay;
6363

64-
const BOOT_CODE_POX_BODY: &'static str = std::include_str!("pox.clar");
65-
const BOOT_CODE_POX_TESTNET_CONSTS: &'static str = std::include_str!("pox-testnet.clar");
66-
const BOOT_CODE_POX_MAINNET_CONSTS: &'static str = std::include_str!("pox-mainnet.clar");
67-
pub const BOOT_CODE_LOCKUP: &'static str = std::include_str!("lockup.clar");
68-
pub const BOOT_CODE_COSTS: &'static str = std::include_str!("costs.clar");
69-
pub const BOOT_CODE_COSTS_2: &'static str = std::include_str!("costs-2.clar");
70-
pub const BOOT_CODE_COSTS_3: &'static str = std::include_str!("costs-3.clar");
71-
pub const BOOT_CODE_COSTS_2_TESTNET: &'static str = std::include_str!("costs-2-testnet.clar");
72-
pub const BOOT_CODE_COST_VOTING_MAINNET: &'static str = std::include_str!("cost-voting.clar");
73-
pub const BOOT_CODE_BNS: &'static str = std::include_str!("bns.clar");
74-
pub const BOOT_CODE_GENESIS: &'static str = std::include_str!("genesis.clar");
75-
pub const POX_1_NAME: &'static str = "pox";
76-
pub const POX_2_NAME: &'static str = "pox-2";
77-
pub const POX_3_NAME: &'static str = "pox-3";
78-
pub const POX_4_NAME: &'static str = "pox-4";
79-
pub const SIGNERS_NAME: &'static str = "signers";
80-
pub const SIGNERS_VOTING_NAME: &'static str = "signers-voting";
64+
const BOOT_CODE_POX_BODY: &str = std::include_str!("pox.clar");
65+
const BOOT_CODE_POX_TESTNET_CONSTS: &str = std::include_str!("pox-testnet.clar");
66+
const BOOT_CODE_POX_MAINNET_CONSTS: &str = std::include_str!("pox-mainnet.clar");
67+
pub const BOOT_CODE_LOCKUP: &str = std::include_str!("lockup.clar");
68+
pub const BOOT_CODE_COSTS: &str = std::include_str!("costs.clar");
69+
pub const BOOT_CODE_COSTS_2: &str = std::include_str!("costs-2.clar");
70+
pub const BOOT_CODE_COSTS_3: &str = std::include_str!("costs-3.clar");
71+
pub const BOOT_CODE_COSTS_2_TESTNET: &str = std::include_str!("costs-2-testnet.clar");
72+
pub const BOOT_CODE_COST_VOTING_MAINNET: &str = std::include_str!("cost-voting.clar");
73+
pub const BOOT_CODE_BNS: &str = std::include_str!("bns.clar");
74+
pub const BOOT_CODE_GENESIS: &str = std::include_str!("genesis.clar");
75+
pub const POX_1_NAME: &str = "pox";
76+
pub const POX_2_NAME: &str = "pox-2";
77+
pub const POX_3_NAME: &str = "pox-3";
78+
pub const POX_4_NAME: &str = "pox-4";
79+
pub const SIGNERS_NAME: &str = "signers";
80+
pub const SIGNERS_VOTING_NAME: &str = "signers-voting";
8181
pub const SIGNERS_VOTING_FUNCTION_NAME: &str = "vote-for-aggregate-public-key";
8282
/// This is the name of a variable in the `.signers` contract which tracks the most recently updated
8383
/// reward cycle number.
84-
pub const SIGNERS_UPDATE_STATE: &'static str = "last-set-cycle";
84+
pub const SIGNERS_UPDATE_STATE: &str = "last-set-cycle";
8585
pub const SIGNERS_MAX_LIST_SIZE: usize = 4000;
8686
pub const SIGNERS_PK_LEN: usize = 33;
8787

88-
const POX_2_BODY: &'static str = std::include_str!("pox-2.clar");
89-
const POX_3_BODY: &'static str = std::include_str!("pox-3.clar");
90-
const POX_4_BODY: &'static str = std::include_str!("pox-4.clar");
91-
pub const SIGNERS_BODY: &'static str = std::include_str!("signers.clar");
92-
pub const SIGNERS_DB_0_BODY: &'static str = std::include_str!("signers-0-xxx.clar");
93-
pub const SIGNERS_DB_1_BODY: &'static str = std::include_str!("signers-1-xxx.clar");
94-
pub const SIGNERS_VOTING_BODY: &'static str = std::include_str!("signers-voting.clar");
95-
96-
pub const COSTS_1_NAME: &'static str = "costs";
97-
pub const COSTS_2_NAME: &'static str = "costs-2";
98-
pub const COSTS_3_NAME: &'static str = "costs-3";
88+
const POX_2_BODY: &str = std::include_str!("pox-2.clar");
89+
const POX_3_BODY: &str = std::include_str!("pox-3.clar");
90+
const POX_4_BODY: &str = std::include_str!("pox-4.clar");
91+
pub const SIGNERS_BODY: &str = std::include_str!("signers.clar");
92+
pub const SIGNERS_DB_0_BODY: &str = std::include_str!("signers-0-xxx.clar");
93+
pub const SIGNERS_DB_1_BODY: &str = std::include_str!("signers-1-xxx.clar");
94+
pub const SIGNERS_VOTING_BODY: &str = std::include_str!("signers-voting.clar");
95+
96+
pub const COSTS_1_NAME: &str = "costs";
97+
pub const COSTS_2_NAME: &str = "costs-2";
98+
pub const COSTS_3_NAME: &str = "costs-3";
9999
/// This contract name is used in testnet **only** to lookup an initial
100100
/// setting for the pox-4 aggregate key. This contract should contain a `define-read-only`
101101
/// function called `aggregate-key` with zero arguments which returns a (buff 33)
102-
pub const BOOT_TEST_POX_4_AGG_KEY_CONTRACT: &'static str = "pox-4-agg-test-booter";
103-
pub const BOOT_TEST_POX_4_AGG_KEY_FNAME: &'static str = "aggregate-key";
102+
pub const BOOT_TEST_POX_4_AGG_KEY_CONTRACT: &str = "pox-4-agg-test-booter";
103+
pub const BOOT_TEST_POX_4_AGG_KEY_FNAME: &str = "aggregate-key";
104104

105-
pub const MINERS_NAME: &'static str = "miners";
105+
pub const MINERS_NAME: &str = "miners";
106106

107107
pub mod docs;
108108

@@ -237,7 +237,7 @@ pub struct RewardSetData {
237237
pub reward_set: RewardSet,
238238
pub cycle_number: u64,
239239
}
240-
const POX_CYCLE_START_HANDLED_VALUE: &'static str = "1";
240+
const POX_CYCLE_START_HANDLED_VALUE: &str = "1";
241241

242242
impl PoxStartCycleInfo {
243243
pub fn serialize(&self) -> String {

0 commit comments

Comments
 (0)