-
Notifications
You must be signed in to change notification settings - Fork 715
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Only enable test framework on feature * Bump shlex to 1.3.0 * Update glob pattern in setup test? * Update ci.yml * Update ci.yml * Update send_message_condition.wasm * Update CI to use rust-script instead of unmaintained cargo script
- Loading branch information
1 parent
9a34d7a
commit 9ce47f7
Showing
11 changed files
with
167 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+0 Bytes
(100%)
massa-execution-worker/src/tests/wasm/send_message_condition.wasm
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| use std::sync::{Arc, Condvar, Mutex}; | ||
|
|
||
| use massa_hash::Hash; | ||
| use massa_models::{ | ||
| address::Address, | ||
| amount::Amount, | ||
| block::{Block, BlockSerializer, SecureShareBlock}, | ||
| block_header::{BlockHeader, BlockHeaderSerializer}, | ||
| block_id::BlockId, | ||
| denunciation::Denunciation, | ||
| endorsement::{Endorsement, EndorsementSerializer, SecureShareEndorsement}, | ||
| operation::{ | ||
| compute_operations_hash, Operation, OperationIdSerializer, OperationSerializer, | ||
| OperationType, SecureShareOperation, | ||
| }, | ||
| secure_share::SecureShareContent, | ||
| slot::Slot, | ||
| }; | ||
| use massa_signature::KeyPair; | ||
|
|
||
| pub trait TestUniverse { | ||
| type ForeignControllers; | ||
| type Config: Default; | ||
|
|
||
| fn new(controllers: Self::ForeignControllers, config: Self::Config) -> Self; | ||
|
|
||
| fn initialize(&self) { | ||
| //TODO: unusable now when launching multiple tests. need a fix | ||
| // let default_panic = std::panic::take_hook(); | ||
| // std::panic::set_hook(Box::new(move |info| { | ||
| // default_panic(info); | ||
| // std::process::exit(1); | ||
| // })); | ||
| use tracing_subscriber::{prelude::*, EnvFilter}; | ||
| let tracing_layer = | ||
| tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()); | ||
| let _ = tracing_subscriber::registry() | ||
| .with(tracing_layer) | ||
| .try_init(); | ||
| } | ||
|
|
||
| // TODO: Create a block builder | ||
| fn create_block( | ||
| keypair: &KeyPair, | ||
| slot: Slot, | ||
| operations: Vec<SecureShareOperation>, | ||
| endorsements: Vec<SecureShareEndorsement>, | ||
| denunciations: Vec<Denunciation>, | ||
| ) -> SecureShareBlock { | ||
| let op_ids = operations.iter().map(|op| op.id).collect::<Vec<_>>(); | ||
| let operation_merkle_root = compute_operations_hash(&op_ids, &OperationIdSerializer::new()); | ||
| let header = BlockHeader::new_verifiable( | ||
| BlockHeader { | ||
| current_version: 0, | ||
| announced_version: None, | ||
| slot, | ||
| parents: vec![ | ||
| BlockId::generate_from_hash(Hash::compute_from("Genesis 0".as_bytes())), | ||
| BlockId::generate_from_hash(Hash::compute_from("Genesis 1".as_bytes())), | ||
| ], | ||
| operation_merkle_root, | ||
| endorsements, | ||
| denunciations, | ||
| }, | ||
| BlockHeaderSerializer::new(), | ||
| keypair, | ||
| 0, | ||
| ) | ||
| .unwrap(); | ||
|
|
||
| Block::new_verifiable( | ||
| Block { | ||
| header, | ||
| operations: op_ids, | ||
| }, | ||
| BlockSerializer::new(), | ||
| keypair, | ||
| 0, | ||
| ) | ||
| .unwrap() | ||
| } | ||
|
|
||
| fn create_operation( | ||
| keypair: &KeyPair, | ||
| expire_period: u64, | ||
| chain_id: u64, | ||
| ) -> SecureShareOperation { | ||
| let recv_keypair = KeyPair::generate(0).unwrap(); | ||
|
|
||
| let op = OperationType::Transaction { | ||
| recipient_address: Address::from_public_key(&recv_keypair.get_public_key()), | ||
| amount: Amount::default(), | ||
| }; | ||
| let content = Operation { | ||
| fee: Amount::default(), | ||
| op, | ||
| expire_period, | ||
| }; | ||
| Operation::new_verifiable(content, OperationSerializer::new(), keypair, chain_id).unwrap() | ||
| } | ||
|
|
||
| fn create_endorsement(creator: &KeyPair, slot: Slot) -> SecureShareEndorsement { | ||
| let content = Endorsement { | ||
| slot, | ||
| index: 0, | ||
| endorsed_block: BlockId::generate_from_hash(Hash::compute_from("Genesis 1".as_bytes())), | ||
| }; | ||
| Endorsement::new_verifiable(content, EndorsementSerializer::new(), creator, 0).unwrap() | ||
| } | ||
| } | ||
|
|
||
| pub struct WaitPoint(Arc<WaitPointInner>); | ||
|
|
||
| struct WaitPointInner { | ||
| mutex: Mutex<bool>, | ||
| condvar: Condvar, | ||
| } | ||
|
|
||
| impl Default for WaitPoint { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl WaitPoint { | ||
| pub fn new() -> Self { | ||
| Self(Arc::new(WaitPointInner { | ||
| mutex: Mutex::new(false), | ||
| condvar: Condvar::new(), | ||
| })) | ||
| } | ||
|
|
||
| pub fn get_trigger_handle(&self) -> WaitPoint { | ||
| WaitPoint(self.0.clone()) | ||
| } | ||
|
|
||
| pub fn wait(&self) { | ||
| let mut started = self.0.mutex.lock().unwrap(); | ||
| *started = false; | ||
| while !*started { | ||
| started = self.0.condvar.wait(started).unwrap(); | ||
| } | ||
| } | ||
|
|
||
| pub fn trigger(&self) { | ||
| let mut started = self.0.mutex.lock().unwrap(); | ||
| *started = true; | ||
| // We notify the condvar that the value has changed. | ||
| self.0.condvar.notify_one(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,151 +1,5 @@ | ||
| use std::sync::{Arc, Condvar, Mutex}; | ||
| #[cfg(feature = "test-exports")] | ||
| mod framework; | ||
|
|
||
| use massa_hash::Hash; | ||
| use massa_models::{ | ||
| address::Address, | ||
| amount::Amount, | ||
| block::{Block, BlockSerializer, SecureShareBlock}, | ||
| block_header::{BlockHeader, BlockHeaderSerializer}, | ||
| block_id::BlockId, | ||
| denunciation::Denunciation, | ||
| endorsement::{Endorsement, EndorsementSerializer, SecureShareEndorsement}, | ||
| operation::{ | ||
| compute_operations_hash, Operation, OperationIdSerializer, OperationSerializer, | ||
| OperationType, SecureShareOperation, | ||
| }, | ||
| secure_share::SecureShareContent, | ||
| slot::Slot, | ||
| }; | ||
| use massa_signature::KeyPair; | ||
|
|
||
| pub trait TestUniverse { | ||
| type ForeignControllers; | ||
| type Config: Default; | ||
|
|
||
| fn new(controllers: Self::ForeignControllers, config: Self::Config) -> Self; | ||
|
|
||
| fn initialize(&self) { | ||
| //TODO: unusable now when launching multiple tests. need a fix | ||
| // let default_panic = std::panic::take_hook(); | ||
| // std::panic::set_hook(Box::new(move |info| { | ||
| // default_panic(info); | ||
| // std::process::exit(1); | ||
| // })); | ||
| use tracing_subscriber::{prelude::*, EnvFilter}; | ||
| let tracing_layer = | ||
| tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()); | ||
| let _ = tracing_subscriber::registry() | ||
| .with(tracing_layer) | ||
| .try_init(); | ||
| } | ||
|
|
||
| // TODO: Create a block builder | ||
| fn create_block( | ||
| keypair: &KeyPair, | ||
| slot: Slot, | ||
| operations: Vec<SecureShareOperation>, | ||
| endorsements: Vec<SecureShareEndorsement>, | ||
| denunciations: Vec<Denunciation>, | ||
| ) -> SecureShareBlock { | ||
| let op_ids = operations.iter().map(|op| op.id).collect::<Vec<_>>(); | ||
| let operation_merkle_root = compute_operations_hash(&op_ids, &OperationIdSerializer::new()); | ||
| let header = BlockHeader::new_verifiable( | ||
| BlockHeader { | ||
| current_version: 0, | ||
| announced_version: None, | ||
| slot, | ||
| parents: vec![ | ||
| BlockId::generate_from_hash(Hash::compute_from("Genesis 0".as_bytes())), | ||
| BlockId::generate_from_hash(Hash::compute_from("Genesis 1".as_bytes())), | ||
| ], | ||
| operation_merkle_root, | ||
| endorsements, | ||
| denunciations, | ||
| }, | ||
| BlockHeaderSerializer::new(), | ||
| keypair, | ||
| 0, | ||
| ) | ||
| .unwrap(); | ||
|
|
||
| Block::new_verifiable( | ||
| Block { | ||
| header, | ||
| operations: op_ids, | ||
| }, | ||
| BlockSerializer::new(), | ||
| keypair, | ||
| 0, | ||
| ) | ||
| .unwrap() | ||
| } | ||
|
|
||
| fn create_operation( | ||
| keypair: &KeyPair, | ||
| expire_period: u64, | ||
| chain_id: u64, | ||
| ) -> SecureShareOperation { | ||
| let recv_keypair = KeyPair::generate(0).unwrap(); | ||
|
|
||
| let op = OperationType::Transaction { | ||
| recipient_address: Address::from_public_key(&recv_keypair.get_public_key()), | ||
| amount: Amount::default(), | ||
| }; | ||
| let content = Operation { | ||
| fee: Amount::default(), | ||
| op, | ||
| expire_period, | ||
| }; | ||
| Operation::new_verifiable(content, OperationSerializer::new(), keypair, chain_id).unwrap() | ||
| } | ||
|
|
||
| fn create_endorsement(creator: &KeyPair, slot: Slot) -> SecureShareEndorsement { | ||
| let content = Endorsement { | ||
| slot, | ||
| index: 0, | ||
| endorsed_block: BlockId::generate_from_hash(Hash::compute_from("Genesis 1".as_bytes())), | ||
| }; | ||
| Endorsement::new_verifiable(content, EndorsementSerializer::new(), creator, 0).unwrap() | ||
| } | ||
| } | ||
|
|
||
| pub struct WaitPoint(Arc<WaitPointInner>); | ||
|
|
||
| struct WaitPointInner { | ||
| mutex: Mutex<bool>, | ||
| condvar: Condvar, | ||
| } | ||
|
|
||
| impl Default for WaitPoint { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } | ||
|
|
||
| impl WaitPoint { | ||
| pub fn new() -> Self { | ||
| Self(Arc::new(WaitPointInner { | ||
| mutex: Mutex::new(false), | ||
| condvar: Condvar::new(), | ||
| })) | ||
| } | ||
|
|
||
| pub fn get_trigger_handle(&self) -> WaitPoint { | ||
| WaitPoint(self.0.clone()) | ||
| } | ||
|
|
||
| pub fn wait(&self) { | ||
| let mut started = self.0.mutex.lock().unwrap(); | ||
| *started = false; | ||
| while !*started { | ||
| started = self.0.condvar.wait(started).unwrap(); | ||
| } | ||
| } | ||
|
|
||
| pub fn trigger(&self) { | ||
| let mut started = self.0.mutex.lock().unwrap(); | ||
| *started = true; | ||
| // We notify the condvar that the value has changed. | ||
| self.0.condvar.notify_one(); | ||
| } | ||
| } | ||
| #[cfg(feature = "test-exports")] | ||
| pub use framework::{TestUniverse, WaitPoint}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters