absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into next

Browse Source 
This is an initial resolution of conflicts which does not work.
This commit is contained in:
Luke Parker
2025-01-30 00:56:29 -05:00
parent 3655dc723f e9c1235b76
commit 258c02ff39
128 changed files with 1835 additions and 44261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/message-queue/src/lib.rs
View File

@@ -7,23 +7,25 @@ use ciphersuite::{
Ciphersuite, Ristretto,
};
use serai_primitives::NetworkId;
use serai_primitives::{ExternalNetworkId, EXTERNAL_NETWORKS};
use dockertest::{
PullPolicy, Image, LogAction, LogPolicy, LogSource, LogOptions, TestBodySpecification,
};
pub type MessageQueuePrivateKey = <Ristretto as Ciphersuite>::F;
pub fn instance(
) -> (MessageQueuePrivateKey, HashMap<NetworkId, MessageQueuePrivateKey>, TestBodySpecification) {
pub fn instance() -> (
MessageQueuePrivateKey,
HashMap<ExternalNetworkId, MessageQueuePrivateKey>,
TestBodySpecification,
) {
serai_docker_tests::build("message-queue".to_string());
let coord_key = <Ristretto as Ciphersuite>::F::random(&mut OsRng);
let priv_keys = HashMap::from([
(NetworkId::Bitcoin, <Ristretto as Ciphersuite>::F::random(&mut OsRng)),
(NetworkId::Ethereum, <Ristretto as Ciphersuite>::F::random(&mut OsRng)),
(NetworkId::Monero, <Ristretto as Ciphersuite>::F::random(&mut OsRng)),
]);
let priv_keys = EXTERNAL_NETWORKS
.into_iter()
.map(|n| (n, <Ristretto as Ciphersuite>::F::random(&mut OsRng)))
.collect::<HashMap<_, _>>();
let composition = TestBodySpecification::with_image(
Image::with_repository("serai-dev-message-queue").pull_policy(PullPolicy::Never),
@@ -38,15 +40,15 @@ pub fn instance(
("COORDINATOR_KEY".to_string(), hex::encode((Ristretto::generator() * coord_key).to_bytes())),
(
"BITCOIN_KEY".to_string(),
hex::encode((Ristretto::generator() * priv_keys[&NetworkId::Bitcoin]).to_bytes()),
hex::encode((Ristretto::generator() * priv_keys[&ExternalNetworkId::Bitcoin]).to_bytes()),
),
(
"ETHEREUM_KEY".to_string(),
hex::encode((Ristretto::generator() * priv_keys[&NetworkId::Ethereum]).to_bytes()),
hex::encode((Ristretto::generator() * priv_keys[&ExternalNetworkId::Ethereum]).to_bytes()),
),
(
"MONERO_KEY".to_string(),
hex::encode((Ristretto::generator() * priv_keys[&NetworkId::Monero]).to_bytes()),
hex::encode((Ristretto::generator() * priv_keys[&ExternalNetworkId::Monero]).to_bytes()),
),
("DB_PATH".to_string(), "./message-queue-db".to_string()),
("RUST_LOG".to_string(), "serai_message_queue=trace,".to_string()),
@@ -85,7 +87,7 @@ fn basic_functionality() {
.queue(
Metadata {
from: Service::Coordinator,
to: Service::Processor(NetworkId::Bitcoin),
to: Service::Processor(ExternalNetworkId::Bitcoin),
intent: b"intent".to_vec(),
},
b"Hello, World!".to_vec(),
@@ -99,7 +101,7 @@ fn basic_functionality() {
.queue(
Metadata {
from: Service::Coordinator,
to: Service::Processor(NetworkId::Bitcoin),
to: Service::Processor(ExternalNetworkId::Bitcoin),
intent: b"intent 2".to_vec(),
},
b"Hello, World, again!".to_vec(),
@@ -110,9 +112,9 @@ fn basic_functionality() {
// Successfully get it
let bitcoin = MessageQueue::new(
Service::Processor(NetworkId::Bitcoin),
Service::Processor(ExternalNetworkId::Bitcoin),
rpc.clone(),
Zeroizing::new(priv_keys[&NetworkId::Bitcoin]),
Zeroizing::new(priv_keys[&ExternalNetworkId::Bitcoin]),
);
let msg = bitcoin.next(Service::Coordinator).await;
assert_eq!(msg.from, Service::Coordinator);
@@ -142,7 +144,7 @@ fn basic_functionality() {
.queue(
Metadata {
from: Service::Coordinator,
to: Service::Processor(NetworkId::Monero),
to: Service::Processor(ExternalNetworkId::Monero),
// Intents should be per-from-to, making this valid
intent: b"intent".to_vec(),
},
@@ -152,9 +154,9 @@ fn basic_functionality() {
.unwrap();
let monero = MessageQueue::new(
Service::Processor(NetworkId::Monero),
Service::Processor(ExternalNetworkId::Monero),
rpc,
Zeroizing::new(priv_keys[&NetworkId::Monero]),
Zeroizing::new(priv_keys[&ExternalNetworkId::Monero]),
);
assert_eq!(monero.next(Service::Coordinator).await.id, 0);
monero.ack(Service::Coordinator, 0).await;