Some minor renames

chainstate/storage/src/internal/test.rs

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use super::*;
-use common::chain::tokens::OutputValue;
+use common::chain::output_value::OutputValue;
 use common::chain::transaction::signed_transaction::SignedTransaction;
 use common::chain::{Block, Destination, TxOutput};
 use common::primitives::{Amount, Idable, H256};

chainstate/test-framework/src/block_builder.rs

@@ -98,7 +98,7 @@ impl<'f> BlockBuilder<'f> {
             if !self.used_utxo.contains(outpoint) {
                 let new_utxo_data = create_multiple_utxo_data(
                     &self.framework.chainstate,
-                    outpoint.tx_id(),
+                    outpoint.source_id(),
                     outpoint.output_index() as usize,
                     utxo.output(),
                     rng,

chainstate/test-framework/src/framework.rs

@@ -308,7 +308,7 @@ fn process_block(#[case] seed: test_utils::random::Seed) {
     use crate::TransactionBuilder;
     use common::{
         chain::{
-            signature::inputsig::InputWitness, tokens::OutputValue, Destination, GenBlock,
+            output_value::OutputValue, signature::inputsig::InputWitness, Destination, GenBlock,
             OutPointSourceId, TxInput, TxOutput,
         },
         primitives::{Amount, Id, Idable},

chainstate/test-framework/src/transaction_builder.rs

@@ -15,8 +15,8 @@
 
 use common::{
     chain::{
-        signature::inputsig::InputWitness, signed_transaction::SignedTransaction,
-        tokens::OutputValue, Destination, Transaction, TxInput, TxOutput,
+        output_value::OutputValue, signature::inputsig::InputWitness,
+        signed_transaction::SignedTransaction, Destination, Transaction, TxInput, TxOutput,
     },
     primitives::Amount,
 };

chainstate/test-framework/src/utils.rs

@@ -23,12 +23,13 @@ use common::{
         block::{consensus_data::PoSData, timestamp::BlockTimestamp, BlockRewardTransactable},
         config::{Builder as ConfigBuilder, ChainType, EpochIndex},
         create_unittest_pos_config,
+        output_value::OutputValue,
         signature::{
             inputsig::{standard_signature::StandardInputSignature, InputWitness},
             sighash::sighashtype::SigHashType,
         },
         stakelock::StakePoolData,
-        tokens::{OutputValue, TokenData, TokenTransfer},
+        tokens::{TokenData, TokenTransfer},
         Block, ChainConfig, ConsensusUpgrade, Destination, GenBlock, Genesis, NetUpgrades,
         OutPointSourceId, PoolId, RequiredConsensus, TxInput, TxOutput, UpgradeVersion,
         UtxoOutPoint,
@@ -362,7 +363,7 @@ pub fn produce_kernel_signature(
     kernel_outpoint: UtxoOutPoint,
 ) -> StandardInputSignature {
     let block_outputs = tf.outputs_from_genblock(kernel_utxo_block_id);
-    let utxo = &block_outputs.get(&kernel_outpoint.tx_id()).unwrap()
+    let utxo = &block_outputs.get(&kernel_outpoint.source_id()).unwrap()
         [kernel_outpoint.output_index() as usize];
 
     let kernel_inputs = vec![kernel_outpoint.into()];

chainstate/test-suite/src/tests/block_status.rs

@@ -22,7 +22,7 @@ use chainstate_test_framework::{
 use chainstate_types::{BlockStatus, BlockValidationStage};
 use common::{
     chain::{
-        signed_transaction::SignedTransaction, tokens::OutputValue, Block, GenBlock,
+        output_value::OutputValue, signed_transaction::SignedTransaction, Block, GenBlock,
         OutPointSourceId, Transaction, TxInput, TxOutput,
     },
     primitives::{Amount, Id, Idable},

chainstate/test-suite/src/tests/chainstate_accounting_storage_tests.rs

@@ -26,7 +26,7 @@ use chainstate_test_framework::{
 };
 use common::{
     chain::{
-        config::Builder as ConfigBuilder, stakelock::StakePoolData, tokens::OutputValue,
+        config::Builder as ConfigBuilder, output_value::OutputValue, stakelock::StakePoolData,
         Destination, OutPointSourceId, PoolId, SignedTransaction, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{per_thousand::PerThousand, Amount, Idable},

chainstate/test-suite/src/tests/chainstate_storage_tests.rs

@@ -22,9 +22,8 @@ use chainstate_test_framework::{
 };
 use common::{
     chain::{
-        tokens::{
-            token_id, OutputValue, TokenAuxiliaryData, TokenData, TokenIssuance, TokenTransfer,
-        },
+        output_value::OutputValue,
+        tokens::{token_id, TokenAuxiliaryData, TokenData, TokenIssuance, TokenTransfer},
         Destination, OutPointSourceId, SpendablePosition, Transaction, TxInput, TxOutput,
         UtxoOutPoint,
     },
@@ -80,7 +79,7 @@ fn store_coin(#[case] seed: Seed) {
         if *tf.chainstate.get_chainstate_config().tx_index_enabled {
             // tx index is stored
             let tx_index = db_tx
-                .get_mainchain_tx_index(&tx_utxo_outpoint.tx_id())
+                .get_mainchain_tx_index(&tx_utxo_outpoint.source_id())
                 .expect("ok")
                 .expect("some");
             let tx_pos = match tx_index.position() {
@@ -170,8 +169,10 @@ fn store_token(#[case] seed: Seed) {
 
         if *tf.chainstate.get_chainstate_config().tx_index_enabled {
             // tx index is stored
-            let tx_index =
-                db_tx.get_mainchain_tx_index(&tx_outpoint.tx_id()).expect("ok").expect("some");
+            let tx_index = db_tx
+                .get_mainchain_tx_index(&tx_outpoint.source_id())
+                .expect("ok")
+                .expect("some");
             let tx_pos = match tx_index.position() {
                 SpendablePosition::Transaction(tx_pos) => tx_pos,
                 SpendablePosition::BlockReward(_) => unreachable!(),
@@ -288,12 +289,12 @@ fn reorg_store_coin(#[case] seed: Seed) {
         if *tf.chainstate.get_chainstate_config().tx_index_enabled {
             // tx index from block_1 was deleted
             assert_eq!(
-                db_tx.get_mainchain_tx_index(&tx_1_utxo_outpoint.tx_id()).expect("ok"),
+                db_tx.get_mainchain_tx_index(&tx_1_utxo_outpoint.source_id()).expect("ok"),
                 None
             );
             // tx index from block_2 is stored
             let tx_2_index = db_tx
-                .get_mainchain_tx_index(&tx_2_utxo_outpoint.tx_id())
+                .get_mainchain_tx_index(&tx_2_utxo_outpoint.source_id())
                 .expect("ok")
                 .expect("some");
             let tx_2_pos = match tx_2_index.position() {
@@ -310,7 +311,7 @@ fn reorg_store_coin(#[case] seed: Seed) {
             );
             // tx index from block_3 is stored
             let tx_3_index = db_tx
-                .get_mainchain_tx_index(&tx_3_utxo_outpoint.tx_id())
+                .get_mainchain_tx_index(&tx_3_utxo_outpoint.source_id())
                 .expect("ok")
                 .expect("some");
             let tx_3_pos = match tx_3_index.position() {
@@ -327,15 +328,15 @@ fn reorg_store_coin(#[case] seed: Seed) {
             );
         } else {
             assert_eq!(
-                db_tx.get_mainchain_tx_index(&tx_1_utxo_outpoint.tx_id()).expect("ok"),
+                db_tx.get_mainchain_tx_index(&tx_1_utxo_outpoint.source_id()).expect("ok"),
                 None
             );
             assert_eq!(
-                db_tx.get_mainchain_tx_index(&tx_2_utxo_outpoint.tx_id()).expect("ok"),
+                db_tx.get_mainchain_tx_index(&tx_2_utxo_outpoint.source_id()).expect("ok"),
                 None
             );
             assert_eq!(
-                db_tx.get_mainchain_tx_index(&tx_3_utxo_outpoint.tx_id()).expect("ok"),
+                db_tx.get_mainchain_tx_index(&tx_3_utxo_outpoint.source_id()).expect("ok"),
                 None
             );
         }
@@ -485,12 +486,14 @@ fn reorg_store_token(#[case] seed: Seed) {
         if *tf.chainstate.get_chainstate_config().tx_index_enabled {
             // tx index from block_1 was deleted
             assert_eq!(
-                db_tx.get_mainchain_tx_index(&tx_1_outpoint.tx_id()).expect("ok"),
+                db_tx.get_mainchain_tx_index(&tx_1_outpoint.source_id()).expect("ok"),
                 None
             );
             // tx index from block_2 is stored
-            let tx_2_index =
-                db_tx.get_mainchain_tx_index(&tx_2_outpoint.tx_id()).expect("ok").expect("some");
+            let tx_2_index = db_tx
+                .get_mainchain_tx_index(&tx_2_outpoint.source_id())
+                .expect("ok")
+                .expect("some");
             let tx_2_pos = match tx_2_index.position() {
                 SpendablePosition::Transaction(tx_pos) => tx_pos,
                 SpendablePosition::BlockReward(_) => unreachable!(),
@@ -504,8 +507,10 @@ fn reorg_store_token(#[case] seed: Seed) {
                 tx_2_id
             );
             // tx index from block_3 is stored
-            let tx_3_index =
-                db_tx.get_mainchain_tx_index(&tx_3_outpoint.tx_id()).expect("ok").expect("some");
+            let tx_3_index = db_tx
+                .get_mainchain_tx_index(&tx_3_outpoint.source_id())
+                .expect("ok")
+                .expect("some");
             let tx_3_pos = match tx_3_index.position() {
                 SpendablePosition::Transaction(tx_pos) => tx_pos,
                 SpendablePosition::BlockReward(_) => unreachable!(),

chainstate/test-suite/src/tests/delegation_tests.rs

@@ -23,8 +23,8 @@ use chainstate_test_framework::{
 use common::chain::{AccountOutPoint, AccountSpending, AccountType, DelegationId, PoolId};
 use common::{
     chain::{
-        timelock::OutputTimeLock, tokens::OutputValue, AccountNonce, Destination, OutPointSourceId,
-        TxInput, TxOutput, UtxoOutPoint,
+        output_value::OutputValue, timelock::OutputTimeLock, AccountNonce, Destination,
+        OutPointSourceId, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{Amount, Idable, H256},
 };

chainstate/test-suite/src/tests/double_spend_tests.rs

@@ -28,7 +28,7 @@ use common::chain::signed_transaction::SignedTransaction;
 use common::chain::UtxoOutPoint;
 use common::primitives::Idable;
 use common::{
-    chain::{tokens::OutputValue, OutPointSourceId, Transaction, TxInput, TxOutput},
+    chain::{output_value::OutputValue, OutPointSourceId, Transaction, TxInput, TxOutput},
     primitives::{Amount, Id},
 };
 use crypto::random::SliceRandom;

chainstate/test-suite/src/tests/fungible_tokens.rs

@@ -25,8 +25,9 @@ use common::chain::UtxoOutPoint;
 use common::primitives::{id, Id};
 use common::{
     chain::{
+        output_value::OutputValue,
         signature::inputsig::InputWitness,
-        tokens::{token_id, OutputValue, TokenData, TokenId},
+        tokens::{token_id, TokenData, TokenId},
         Destination, OutPointSourceId, TxInput, TxOutput,
     },
     primitives::{Amount, Idable},

chainstate/test-suite/src/tests/helpers/mod.rs

@@ -16,8 +16,9 @@
 use chainstate_test_framework::{anyonecanspend_address, TestFramework, TransactionBuilder};
 use common::{
     chain::{
-        block::timestamp::BlockTimestamp, signature::inputsig::InputWitness,
-        timelock::OutputTimeLock, tokens::OutputValue, Destination, Transaction, TxInput, TxOutput,
+        block::timestamp::BlockTimestamp, output_value::OutputValue,
+        signature::inputsig::InputWitness, timelock::OutputTimeLock, Destination, Transaction,
+        TxInput, TxOutput,
     },
     primitives::{Amount, BlockDistance, Id, Idable},
 };

chainstate/test-suite/src/tests/helpers/pos.rs

@@ -17,7 +17,7 @@ use chainstate_storage::Transactional;
 use chainstate_test_framework::TestFramework;
 use common::{
     chain::{
-        block::timestamp::BlockTimestamp, stakelock::StakePoolData, tokens::OutputValue,
+        block::timestamp::BlockTimestamp, output_value::OutputValue, stakelock::StakePoolData,
         Destination, Genesis, RequiredConsensus, TxOutput,
     },
     primitives::{per_thousand::PerThousand, Amount, BlockHeight, Compact, H256},

chainstate/test-suite/src/tests/homomorphism.rs

@@ -20,7 +20,8 @@ use chainstate_test_framework::{
 };
 use common::{
     chain::{
-        tokens::{token_id, OutputValue, TokenData, TokenIssuance, TokenTransfer},
+        output_value::OutputValue,
+        tokens::{token_id, TokenData, TokenIssuance, TokenTransfer},
         Destination, OutPointSourceId, TxInput, TxOutput,
     },
     primitives::{Amount, Idable},

chainstate/test-suite/src/tests/nft_burn.rs

@@ -19,8 +19,9 @@ use chainstate::{
 };
 use chainstate_test_framework::{TestFramework, TransactionBuilder};
 use common::chain::{
+    output_value::OutputValue,
     signature::inputsig::InputWitness,
-    tokens::{token_id, OutputValue, TokenData, TokenTransfer},
+    tokens::{token_id, TokenData, TokenTransfer},
     Destination, TxInput, TxOutput,
 };
 use common::chain::{OutPointSourceId, UtxoOutPoint};

chainstate/test-suite/src/tests/nft_issuance.rs

@@ -18,13 +18,12 @@ use chainstate::{
     CheckBlockTransactionsError, TokensError,
 };
 use chainstate_test_framework::{get_output_value, TestFramework, TransactionBuilder};
-use common::chain::tokens::OutputValue;
-use common::chain::tokens::TokenData;
+use common::chain::output_value::OutputValue;
 use common::chain::Block;
 use common::chain::OutPointSourceId;
 use common::chain::{
     signature::inputsig::InputWitness,
-    tokens::{Metadata, NftIssuance},
+    tokens::{Metadata, NftIssuance, TokenData},
     Destination, TxInput, TxOutput,
 };
 use common::primitives::Idable;

chainstate/test-suite/src/tests/nft_reorgs.rs

@@ -17,8 +17,9 @@ use chainstate::{BlockError, BlockSource, ChainstateError, ConnectTransactionErr
 use chainstate_test_framework::{get_output_value, TestFramework, TransactionBuilder};
 use common::{
     chain::{
+        output_value::OutputValue,
         signature::inputsig::InputWitness,
-        tokens::{token_id, Metadata, NftIssuance, OutputValue, TokenData, TokenTransfer},
+        tokens::{token_id, Metadata, NftIssuance, TokenData, TokenTransfer},
         Destination, OutPointSourceId, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{Amount, Idable},

chainstate/test-suite/src/tests/nft_transfer.rs

@@ -21,8 +21,9 @@ use chainstate_test_framework::{get_output_value, TestFramework, TransactionBuil
 use common::primitives::Idable;
 use common::{
     chain::{
+        output_value::OutputValue,
         signature::inputsig::InputWitness,
-        tokens::{token_id, Metadata, NftIssuance, OutputValue, TokenData, TokenId, TokenTransfer},
+        tokens::{token_id, Metadata, NftIssuance, TokenData, TokenId, TokenTransfer},
         Destination, OutPointSourceId, TxInput, TxOutput,
     },
     primitives::{Amount, BlockHeight},

chainstate/test-suite/src/tests/output_timelock.rs

@@ -18,9 +18,9 @@ use std::sync::Arc;
 use common::{
     chain::{
         block::{timestamp::BlockTimestamp, GenBlock},
+        output_value::OutputValue,
         signature::inputsig::InputWitness,
         timelock::OutputTimeLock,
-        tokens::OutputValue,
         OutPointSourceId, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{Amount, BlockHeight, Id, Idable},

chainstate/test-suite/src/tests/pos_accounting_reorg.rs

@@ -29,9 +29,9 @@ use chainstate_test_framework::{
 use common::{
     chain::{
         config::{create_unit_test_config, Builder as ConfigBuilder},
+        output_value::OutputValue,
         stakelock::StakePoolData,
         timelock::OutputTimeLock,
-        tokens::OutputValue,
         Destination, GenBlock, OutPointSourceId, PoolId, TxInput, TxOutput, UtxoOutPoint,
     },
     primitives::{per_thousand::PerThousand, Amount, BlockHeight, Id, Idable, H256},

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

@@ -19,8 +19,8 @@ use chainstate::{BlockError, ChainstateError, ConnectTransactionError};
 use chainstate_test_framework::{empty_witness, TestFramework, TransactionBuilder};
 use common::{
     chain::{
-        config::Builder as ConfigBuilder, stakelock::StakePoolData, timelock::OutputTimeLock,
-        tokens::OutputValue, AccountNonce, AccountOutPoint, AccountSpending, ConsensusUpgrade,
+        config::Builder as ConfigBuilder, output_value::OutputValue, stakelock::StakePoolData,
+        timelock::OutputTimeLock, AccountNonce, AccountOutPoint, AccountSpending, ConsensusUpgrade,
         Destination, NetUpgrades, OutPointSourceId, PoSChainConfig, TxInput, TxOutput,
         UpgradeVersion, UtxoOutPoint,
     },

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

@@ -41,13 +41,13 @@ use common::{
         },
         config::{create_unit_test_config, Builder as ConfigBuilder, ChainType, EpochIndex},
         create_unittest_pos_config,
+        output_value::OutputValue,
         signature::{
             inputsig::{standard_signature::StandardInputSignature, InputWitness},
             sighash::sighashtype::SigHashType,
         },
         stakelock::StakePoolData,
         timelock::OutputTimeLock,
-        tokens::OutputValue,
         AccountNonce, AccountOutPoint, AccountSpending, Block, ConsensusUpgrade, Destination,
         GenBlock, Genesis, NetUpgrades, OutPointSourceId, PoSChainConfig, PoolId,
         SignedTransaction, TxInput, TxOutput, UpgradeVersion, UtxoOutPoint,
@@ -277,7 +277,7 @@ fn produce_kernel_signature(
     kernel_outpoint: UtxoOutPoint,
 ) -> StandardInputSignature {
     let block_outputs = tf.outputs_from_genblock(kernel_utxo_block_id);
-    let utxo = &block_outputs.get(&kernel_outpoint.tx_id()).unwrap()
+    let utxo = &block_outputs.get(&kernel_outpoint.source_id()).unwrap()
         [kernel_outpoint.output_index() as usize];
 
     let kernel_inputs = vec![kernel_outpoint.into()];

chainstate/test-suite/src/tests/processing_tests.rs

@@ -36,8 +36,8 @@ use common::{
     chain::{
         block::{consensus_data::PoWData, timestamp::BlockTimestamp, ConsensusData},
         config::{create_unit_test_config, Builder as ConfigBuilder},
+        output_value::OutputValue,
         timelock::OutputTimeLock,
-        tokens::OutputValue,
         Block, ConsensusUpgrade, Destination, GenBlock, NetUpgrades, OutPointSourceId,
         OutputSpentState, PoolId, TxInput, TxOutput, UpgradeVersion,
     },
@@ -355,8 +355,11 @@ fn spend_inputs_simple(#[case] seed: Seed) {
             for tx_in in tx.transaction().inputs() {
                 let outpoint = tx_in.utxo_outpoint().unwrap();
                 if *tf.chainstate.get_chainstate_config().tx_index_enabled {
-                    let prev_out_tx_index =
-                        tf.chainstate.get_mainchain_tx_index(&outpoint.tx_id()).unwrap().unwrap();
+                    let prev_out_tx_index = tf
+                        .chainstate
+                        .get_mainchain_tx_index(&outpoint.source_id())
+                        .unwrap()
+                        .unwrap();
                     assert_eq!(
                         prev_out_tx_index.get_spent_state(outpoint.output_index()).unwrap(),
                         OutputSpentState::SpentBy(tx_id.into())

chainstate/test-suite/src/tests/signature_tests.rs

@@ -20,8 +20,8 @@ use common::chain::signed_transaction::SignedTransaction;
 use common::primitives::Idable;
 use common::{
     chain::{
+        output_value::OutputValue,
         signature::{inputsig::InputWitness, sighash::sighashtype::SigHashType},
-        tokens::OutputValue,
         Destination, OutPointSourceId, TxInput, TxOutput,
     },
     primitives::Amount,