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

feat: hardcoded identity transfers in strategy tests #2312

Merged
merged 8 commits into from
Nov 5, 2024
+138 −66
Merged

feat: hardcoded identity transfers in strategy tests #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24177fa
feat: hardcoded identity transfers in strategy tests
pauldelucia Nov 4, 2024
99fe5fa
add comment
pauldelucia Nov 4, 2024
cee3098
Merge remote-tracking branch 'origin/v1.6-dev' into feat/hardcoded-id…
pauldelucia Nov 4, 2024
0d3e091
comment
pauldelucia Nov 5, 2024
e421514
use into_iter instead of iter
pauldelucia Nov 5, 2024
3d941ec
use current identities instead of hardcoded start identities
pauldelucia Nov 5, 2024
4bc0a65
let transfer keys be any security level or key type
pauldelucia Nov 5, 2024
dc48827
fix
pauldelucia Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/rs-drive-abci/tests/strategy_tests/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2602,7 +2602,10 @@ mod tests {
&simple_signer,
&mut rng,
platform_version,
);
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let strategy = NetworkStrategy {
strategy: Strategy {
Expand Down Expand Up @@ -3910,7 +3913,7 @@ mod tests {
strategy: Strategy {
start_contracts: vec![],
operations: vec![Operation {
op_type: OperationType::IdentityTransfer,
op_type: OperationType::IdentityTransfer(None),
frequency: Frequency {
times_per_block_range: 1..3,
chance_per_block: None,
Expand Down
16 changes: 13 additions & 3 deletions packages/rs-drive-abci/tests/strategy_tests/strategy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use drive_abci::rpc::core::MockCoreRPCLike;
use rand::prelude::{IteratorRandom, SliceRandom, StdRng};
use rand::Rng;
use strategy_tests::Strategy;
use strategy_tests::transitions::{create_state_transitions_for_identities, create_state_transitions_for_identities_and_proofs, instant_asset_lock_proof_fixture, instant_asset_lock_proof_fixture_with_dynamic_range};
use strategy_tests::transitions::{create_state_transitions_for_identities, create_state_transitions_for_identities_and_proofs, instant_asset_lock_proof_fixture_with_dynamic_range};
use std::borrow::Cow;
use std::collections::{BTreeMap, HashMap, HashSet};
use std::ops::RangeInclusive;
Expand Down Expand Up @@ -404,8 +404,18 @@ impl NetworkStrategy {
);
state_transitions.append(&mut new_transitions);
}
// Extend the state transitions with the strategy's hard coded start identities
// Filtering out the ones that have no create transition
if !self.strategy.start_identities.hard_coded.is_empty() {
state_transitions.extend(self.strategy.start_identities.hard_coded.clone());
state_transitions.extend(
self.strategy.start_identities.hard_coded.iter().filter_map(
|(identity, transition)| {
transition.as_ref().map(|create_transition| {
(identity.clone(), create_transition.clone())
})
},
),
);
}
}
let frequency = &self.strategy.identity_inserts.frequency;
Expand Down Expand Up @@ -1196,7 +1206,7 @@ impl NetworkStrategy {
operations.push(state_transition);
}
}
OperationType::IdentityTransfer if current_identities.len() > 1 => {
OperationType::IdentityTransfer(_) if current_identities.len() > 1 => {
let identities_clone = current_identities.clone();

// Sender is the first in the list, which should be loaded_identity
Expand Down
90 changes: 55 additions & 35 deletions packages/rs-drive-abci/tests/strategy_tests/voting_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,17 @@ mod tests {

simple_signer.add_keys(keys1);

let start_identities = create_state_transitions_for_identities(
vec![identity1],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
);
let start_identities: Vec<(Identity, Option<StateTransition>)> =
create_state_transitions_for_identities(
vec![identity1],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let dpns_contract = platform
.drive
Expand Down Expand Up @@ -363,13 +367,17 @@ mod tests {

simple_signer.add_keys(keys2);

let start_identities = create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
);
let start_identities: Vec<(Identity, Option<StateTransition>)> =
create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let dpns_contract = platform
.drive
Expand Down Expand Up @@ -635,13 +643,17 @@ mod tests {

simple_signer.add_keys(keys2);

let start_identities = create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
);
let start_identities: Vec<(Identity, Option<StateTransition>)> =
create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let dpns_contract = platform
.drive
Expand Down Expand Up @@ -988,13 +1000,17 @@ mod tests {

simple_signer.add_keys(keys2);

let start_identities = create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
);
let start_identities: Vec<(Identity, Option<StateTransition>)> =
create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let dpns_contract = platform
.drive
Expand Down Expand Up @@ -1353,13 +1369,17 @@ mod tests {

simple_signer.add_keys(keys2);

let start_identities = create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
);
let start_identities: Vec<(Identity, Option<StateTransition>)> =
create_state_transitions_for_identities(
vec![identity1, identity2],
&(dash_to_duffs!(1)..=dash_to_duffs!(1)),
&simple_signer,
&mut rng,
platform_version,
)
.into_iter()
.map(|(identity, transition)| (identity, Some(transition)))
.collect();

let dpns_contract = platform
.drive
Expand Down
70 changes: 49 additions & 21 deletions packages/strategy-tests/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ use platform_version::TryFromPlatformVersioned;
use rand::prelude::StdRng;
use rand::seq::{IteratorRandom, SliceRandom};
use rand::Rng;
use transitions::create_identity_credit_transfer_transition;
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
use std::ops::RangeInclusive;
use bincode::{Decode, Encode};
Expand Down Expand Up @@ -146,7 +147,7 @@ pub struct StartIdentities {
pub keys_per_identity: u8,
pub starting_balances: u64, // starting balance in duffs
pub extra_keys: KeyMaps,
pub hard_coded: Vec<(Identity, StateTransition)>,
pub hard_coded: Vec<(Identity, Option<StateTransition>)>,
}

/// Identities to register on the first block of the strategy
Expand Down Expand Up @@ -1287,38 +1288,65 @@ impl Strategy {
}

// Generate state transition for identity transfer operation
OperationType::IdentityTransfer if current_identities.len() > 1 => {
OperationType::IdentityTransfer(identity_transfer_info) => {
for _ in 0..count {
let identities_count = current_identities.len();
if identities_count == 0 {
break;
}
// Handle the case where specific sender, recipient, and amount are provided
if let Some(transfer_info) = identity_transfer_info {
let sender = current_identities
.iter()
.find(|identity| identity.id() == transfer_info.from)
.expect(
"Expected to find sender identity in hardcoded start identities",
);
let recipient = current_identities
.iter()
.find(|identity| identity.id() == transfer_info.to)
.expect(
"Expected to find recipient identity in hardcoded start identities",
);

// Select a random identity from the current_identities for the sender
let random_index_sender = rng.gen_range(0..identities_count);
let state_transition = create_identity_credit_transfer_transition(
&sender,
&recipient,
identity_nonce_counter,
signer, // This means in the TUI, the loaded identity must always be the sender since we're always signing with it for now
pauldelucia marked this conversation as resolved.
Show resolved Hide resolved
transfer_info.amount,
);
operations.push(state_transition);
} else if current_identities.len() > 1 {
// Handle the case where no sender, recipient, and amount are provided

// Clone current_identities to a Vec for manipulation
let mut unused_identities: Vec<_> =
current_identities.iter().cloned().collect();
unused_identities.remove(random_index_sender); // Remove the sender
let unused_identities_count = unused_identities.len();
let identities_count = current_identities.len();
if identities_count == 0 {
break;
}

// Select a random identity from the remaining ones for the recipient
let random_index_recipient = rng.gen_range(0..unused_identities_count);
let recipient = &unused_identities[random_index_recipient];
// Select a random identity from the current_identities for the sender
let random_index_sender = rng.gen_range(0..identities_count);

// Use the sender index on the original slice
let sender = &mut current_identities[random_index_sender];
// Clone current_identities to a Vec for manipulation
let mut unused_identities: Vec<_> =
current_identities.iter().cloned().collect();
unused_identities.remove(random_index_sender); // Remove the sender
let unused_identities_count = unused_identities.len();

let state_transition =
crate::transitions::create_identity_credit_transfer_transition(
// Select a random identity from the remaining ones for the recipient
let random_index_recipient =
rng.gen_range(0..unused_identities_count);
let recipient = &unused_identities[random_index_recipient];

// Use the sender index on the original slice
let sender = &mut current_identities[random_index_sender];

let state_transition = create_identity_credit_transfer_transition(
sender,
recipient,
identity_nonce_counter,
signer,
300000,
QuantumExplorer marked this conversation as resolved.
Show resolved Hide resolved
);
operations.push(state_transition);
operations.push(state_transition);
pauldelucia marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

Expand Down
19 changes: 15 additions & 4 deletions packages/strategy-tests/src/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,13 @@ impl VoteAction {

pub type AmountRange = RangeInclusive<Credits>;

#[derive(Clone, Debug, PartialEq, Encode, Decode)]
pub struct IdentityTransferInfo {
pub from: Identifier,
pub to: Identifier,
pub amount: Credits,
}

#[derive(Clone, Debug, PartialEq)]
pub enum OperationType {
Document(DocumentOp),
Expand All @@ -505,7 +512,7 @@ pub enum OperationType {
IdentityWithdrawal(AmountRange),
ContractCreate(RandomDocumentTypeParameters, DocumentTypeCount),
ContractUpdate(DataContractUpdateOp),
IdentityTransfer,
IdentityTransfer(Option<IdentityTransferInfo>),
ResourceVote(ResourceVoteOp),
}

Expand All @@ -517,7 +524,7 @@ enum OperationTypeInSerializationFormat {
IdentityWithdrawal(AmountRange),
ContractCreate(RandomDocumentTypeParameters, DocumentTypeCount),
ContractUpdate(Vec<u8>),
IdentityTransfer,
IdentityTransfer(Option<IdentityTransferInfo>),
ResourceVote(ResourceVoteOpSerializable),
}

Expand Down Expand Up @@ -563,7 +570,9 @@ impl PlatformSerializableWithPlatformVersion for OperationType {
contract_op_in_serialization_format,
)
}
OperationType::IdentityTransfer => OperationTypeInSerializationFormat::IdentityTransfer,
OperationType::IdentityTransfer(identity_transfer_info) => {
OperationTypeInSerializationFormat::IdentityTransfer(identity_transfer_info)
}
OperationType::ResourceVote(resource_vote_op) => {
let vote_op_in_serialization_format =
resource_vote_op.try_into_platform_versioned(platform_version)?;
Expand Down Expand Up @@ -626,7 +635,9 @@ impl PlatformDeserializableWithPotentialValidationFromVersionedStructure for Ope
)?;
OperationType::ContractUpdate(update_op)
}
OperationTypeInSerializationFormat::IdentityTransfer => OperationType::IdentityTransfer,
OperationTypeInSerializationFormat::IdentityTransfer(identity_transfer_info) => {
OperationType::IdentityTransfer(identity_transfer_info)
}
OperationTypeInSerializationFormat::ResourceVote(resource_vote_op) => {
let vote_op = resource_vote_op.try_into_platform_versioned(platform_version)?;
OperationType::ResourceVote(vote_op)
Expand Down
2 changes: 1 addition & 1 deletion packages/strategy-tests/src/transitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ pub fn create_identity_withdrawal_transition_with_output_address(
/// - If the sender's identity does not have a suitable authentication key available for signing.
/// - If there's an error during the signing process.
pub fn create_identity_credit_transfer_transition(
identity: &mut Identity,
identity: &Identity,
recipient: &Identity,
identity_nonce_counter: &mut BTreeMap<Identifier, u64>,
signer: &mut SimpleSigner,
Expand Down
Loading