Skip to content

Commit 59f5707

Browse files
azarovhazarovh
committed
Get rid of TokenIssuanceVersion::CURRENT
1 parent ee2121e commit 59f5707

File tree

11 files changed

+28
-30
lines changed

11 files changed

+28
-30
lines changed

‎blockprod/src/detail/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ mod produce_block {
12501250
5,
12511251
PerThousand::new(1).expect("must be valid"),
12521252
PoSConsensusVersion::V1,
1253-
TokenIssuanceVersion::CURRENT,
1253+
TokenIssuanceVersion::V1,
12541254
)
12551255
.expect("Valid PoS config values");
12561256

‎chainstate/test-suite/src/tests/pos_maturity_settings.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn decommission_maturity_setting_follows_netupgrade(#[case] seed: Seed) {
5959
5,
6060
PerThousand::new(100).unwrap(),
6161
PoSConsensusVersion::V1,
62-
TokenIssuanceVersion::CURRENT,
62+
TokenIssuanceVersion::V1,
6363
)
6464
.unwrap(),
6565
}),
@@ -76,7 +76,7 @@ fn decommission_maturity_setting_follows_netupgrade(#[case] seed: Seed) {
7676
5,
7777
PerThousand::new(100).unwrap(),
7878
PoSConsensusVersion::V1,
79-
TokenIssuanceVersion::CURRENT,
79+
TokenIssuanceVersion::V1,
8080
)
8181
.unwrap(),
8282
}),
@@ -211,7 +211,7 @@ fn spend_share_maturity_setting_follows_netupgrade(#[case] seed: Seed) {
211211
5,
212212
PerThousand::new(100).unwrap(),
213213
PoSConsensusVersion::V1,
214-
TokenIssuanceVersion::CURRENT,
214+
TokenIssuanceVersion::V1,
215215
)
216216
.unwrap(),
217217
}),
@@ -228,7 +228,7 @@ fn spend_share_maturity_setting_follows_netupgrade(#[case] seed: Seed) {
228228
5,
229229
PerThousand::new(100).unwrap(),
230230
PoSConsensusVersion::V1,
231-
TokenIssuanceVersion::CURRENT,
231+
TokenIssuanceVersion::V1,
232232
)
233233
.unwrap(),
234234
}),

‎chainstate/test-suite/src/tests/pos_processing_tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ fn decommission_from_not_best_block(#[case] seed: Seed) {
15371537
5,
15381538
PerThousand::new(100).unwrap(),
15391539
PoSConsensusVersion::V1,
1540-
TokenIssuanceVersion::CURRENT,
1540+
TokenIssuanceVersion::V1,
15411541
)
15421542
.unwrap(),
15431543
}),
@@ -1554,7 +1554,7 @@ fn decommission_from_not_best_block(#[case] seed: Seed) {
15541554
5,
15551555
PerThousand::new(100).unwrap(),
15561556
PoSConsensusVersion::V1,
1557-
TokenIssuanceVersion::CURRENT,
1557+
TokenIssuanceVersion::V1,
15581558
)
15591559
.unwrap(),
15601560
}),

‎chainstate/tx-verifier/src/transaction_verifier/input_output_policy/constraints_accumulator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ mod tests {
469469
2,
470470
PerThousand::new(0).unwrap(),
471471
PoSConsensusVersion::V1,
472-
TokenIssuanceVersion::CURRENT,
472+
TokenIssuanceVersion::V1,
473473
)
474474
.unwrap(),
475475
}),

‎common/src/chain/pos.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pub fn create_testnet_pos_config(consensus_version: PoSConsensusVersion) -> PoSC
179179
block_count_to_average_for_blocktime: DEFAULT_BLOCK_COUNT_TO_AVERAGE,
180180
difficulty_change_limit: PerThousand::new(1).expect("must be valid"),
181181
consensus_version,
182-
token_issuance_version: TokenIssuanceVersion::CURRENT,
182+
token_issuance_version: TokenIssuanceVersion::V1,
183183
}
184184
}
185185

@@ -192,7 +192,7 @@ pub fn create_unittest_pos_config() -> PoSChainConfig {
192192
block_count_to_average_for_blocktime: DEFAULT_BLOCK_COUNT_TO_AVERAGE,
193193
difficulty_change_limit: PerThousand::new(1).expect("must be valid"),
194194
consensus_version: PoSConsensusVersion::V1,
195-
token_issuance_version: TokenIssuanceVersion::CURRENT,
195+
token_issuance_version: TokenIssuanceVersion::V1,
196196
}
197197
}
198198

@@ -208,7 +208,7 @@ pub fn create_regtest_pos_config(consensus_version: PoSConsensusVersion) -> PoSC
208208
block_count_to_average_for_blocktime: DEFAULT_BLOCK_COUNT_TO_AVERAGE,
209209
difficulty_change_limit: PerThousand::new(1).expect("must be valid"),
210210
consensus_version,
211-
token_issuance_version: TokenIssuanceVersion::CURRENT,
211+
token_issuance_version: TokenIssuanceVersion::V1,
212212
}
213213
}
214214

‎common/src/chain/pow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl PoWChainConfigBuilder {
117117
reward_maturity_distance: self
118118
.reward_maturity_distance
119119
.unwrap_or_else(|| BlockDistance::new(500)),
120-
token_issuance_version: TokenIssuanceVersion::CURRENT,
120+
token_issuance_version: TokenIssuanceVersion::V1,
121121
}
122122
}
123123
}

‎common/src/chain/tokens/issuance.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ pub struct TokenIssuanceVersion(u32);
2323
impl TokenIssuanceVersion {
2424
/// Initial issuance implementation
2525
pub const V0: Self = Self(0);
26-
/// Add reissuance support
26+
/// Enable modifying token supply
2727
pub const V1: Self = Self(1);
28-
29-
// FIXME: get rid of CURRENT
30-
pub const CURRENT: Self = Self::V1;
3128
}
3229

3330
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, serde::Serialize)]
3431
pub enum TokenTotalSupply {
3532
Fixed(Amount), // fixed to a certain amount
36-
Lockable, // not known in advance but can be locked at some point in time
33+
Lockable, // not known in advance but can be locked once at some point in time
3734
Unlimited, // limited only by the Amount data type
3835
}
3936

‎common/src/chain/tokens/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ pub struct TokenIssuance {
6767
pub metadata_uri: Vec<u8>,
6868
}
6969

70+
// FIXME: support upgrade from v0 to v1?
7071
#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, serde::Serialize)]
7172
pub enum TokenData {
7273
/// TokenTransfer data to another user. If it is a token, then the token data must also be transferred to the recipient.

‎common/src/chain/transaction/output/output_value.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ use crate::{
2323
#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, serde::Serialize)]
2424
pub enum OutputValue {
2525
Coin(Amount),
26-
Token(Box<TokenData>), // FIXME: add check that this type is not used after upgrade
26+
// FIXME: add check that new tokens cannot be issued after upgrade;
27+
// transfers of existing v0 tokens are allowed?
28+
Token(Box<TokenData>),
2729
TokenV1((TokenId, Amount)),
2830
}
2931

‎consensus/src/pos/target.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ mod tests {
412412
2,
413413
PerThousand::new(100).unwrap(),
414414
PoSConsensusVersion::V1,
415-
TokenIssuanceVersion::CURRENT,
415+
TokenIssuanceVersion::V1,
416416
)
417417
.unwrap();
418418
let new_target =
@@ -435,7 +435,7 @@ mod tests {
435435
2,
436436
PerThousand::new(100).unwrap(),
437437
PoSConsensusVersion::V1,
438-
TokenIssuanceVersion::CURRENT,
438+
TokenIssuanceVersion::V1,
439439
)
440440
.unwrap();
441441
let new_target =
@@ -457,7 +457,7 @@ mod tests {
457457
2,
458458
PerThousand::new(100).unwrap(),
459459
PoSConsensusVersion::V1,
460-
TokenIssuanceVersion::CURRENT,
460+
TokenIssuanceVersion::V1,
461461
)
462462
.unwrap();
463463
let prev_target = H256::random_using(&mut rng).into();
@@ -477,7 +477,7 @@ mod tests {
477477
2,
478478
PerThousand::new(100).unwrap(),
479479
PoSConsensusVersion::V1,
480-
TokenIssuanceVersion::CURRENT,
480+
TokenIssuanceVersion::V1,
481481
)
482482
.unwrap();
483483
let prev_target = Uint256::MAX;
@@ -499,7 +499,7 @@ mod tests {
499499
5,
500500
PerThousand::new(100).expect("must be valid"),
501501
PoSConsensusVersion::V1,
502-
TokenIssuanceVersion::CURRENT,
502+
TokenIssuanceVersion::V1,
503503
)
504504
.unwrap();
505505
let upgrades = vec![(
@@ -576,7 +576,7 @@ mod tests {
576576
2, // block_count_to_average
577577
PerThousand::new(100).expect("must be valid"),
578578
PoSConsensusVersion::V1,
579-
TokenIssuanceVersion::CURRENT,
579+
TokenIssuanceVersion::V1,
580580
)
581581
.unwrap();
582582
let upgrades = vec![(
@@ -626,7 +626,7 @@ mod tests {
626626
3, // block_count_to_average
627627
PerThousand::new(100).expect("must be valid"),
628628
PoSConsensusVersion::V1,
629-
TokenIssuanceVersion::CURRENT,
629+
TokenIssuanceVersion::V1,
630630
)
631631
.unwrap();
632632
let upgrades = vec![(
@@ -722,7 +722,7 @@ mod tests {
722722
2,
723723
PerThousand::new(100).unwrap(),
724724
PoSConsensusVersion::V1,
725-
TokenIssuanceVersion::CURRENT,
725+
TokenIssuanceVersion::V1,
726726
)
727727
.unwrap();
728728
let pos_config_2 = PoSChainConfig::new(
@@ -733,7 +733,7 @@ mod tests {
733733
5,
734734
PerThousand::new(100).unwrap(),
735735
PoSConsensusVersion::V1,
736-
TokenIssuanceVersion::CURRENT,
736+
TokenIssuanceVersion::V1,
737737
)
738738
.unwrap();
739739
let upgrades = vec![
@@ -885,7 +885,7 @@ mod tests {
885885
3,
886886
PerThousand::new(100).unwrap(),
887887
PoSConsensusVersion::V1,
888-
TokenIssuanceVersion::CURRENT,
888+
TokenIssuanceVersion::V1,
889889
)
890890
.unwrap();
891891
let upgrades = vec![

‎utxo/src/cache.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ use crate::{
2121
use common::{
2222
chain::{
2323
block::{BlockReward, BlockRewardTransactable},
24-
output_value::OutputValue,
2524
signature::Signable,
26-
tokens::TokenData,
2725
GenBlock, OutPointSourceId, Transaction, TxInput, TxOutput, UtxoOutPoint,
2826
},
2927
primitives::{BlockHeight, Id, Idable},

0 commit comments

Comments
 (0)