From df2a8151a82bc09fc9d234bd6de4aeda24c21054 Mon Sep 17 00:00:00 2001 From: 4meta5 Date: Wed, 16 Oct 2024 15:19:50 -0400 Subject: [PATCH] try fix errors in chronicle testing and update runtime imports and types as well --- chronicle/src/mock.rs | 22 +++++++++++----------- runtimes/mainnet/src/lib.rs | 17 +++++++++-------- runtimes/testnet/src/lib.rs | 14 +++++++------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/chronicle/src/mock.rs b/chronicle/src/mock.rs index d9f16611b..74dee06fe 100644 --- a/chronicle/src/mock.rs +++ b/chronicle/src/mock.rs @@ -7,21 +7,21 @@ use std::collections::HashMap; use std::sync::{Arc, Mutex}; use time_primitives::traits::IdentifyAccount; use time_primitives::{ - sr25519, AccountId, Balance, BatchId, BlockHash, BlockNumber, ChainName, ChainNetwork, - Commitment, Gateway, GatewayMessage, MemberStatus, NetworkId, PeerId, ProofOfKnowledge, - PublicKey, ShardId, ShardStatus, Task, TaskId, TaskResult, + sr25519, AccountId, Balance, BatchId, BlockHash, BlockNumber, Gateway, GatewayMessage, + MemberStatus, NetworkId, PeerId, ProofOfKnowledge, PublicKey, ShardId, ShardStatus, Task, + TaskId, TaskResult, }; use tokio::time::Duration; use tss::{sum_commitments, VerifiableSecretSharingCommitment, VerifyingKey}; #[derive(Clone, Debug, Eq, PartialEq)] pub struct MockNetwork { - pub chain_name: ChainName, - pub chain_network: ChainNetwork, + pub chain_name: String, + pub chain_network: String, } impl MockNetwork { - pub fn new(chain_name: ChainName, chain_network: ChainNetwork) -> Self { + pub fn new(chain_name: String, chain_network: String) -> Self { Self { chain_name, chain_network } } } @@ -30,7 +30,7 @@ impl MockNetwork { pub struct MockShard { pub members: Vec<(AccountId, MemberStatus)>, pub threshold: u16, - pub commitments: Vec, + pub commitments: Vec>, pub online: usize, } @@ -89,7 +89,7 @@ impl Mock { mock } - pub fn create_network(&self, chain_name: ChainName, chain_network: ChainNetwork) -> NetworkId { + pub fn create_network(&self, chain_name: String, chain_network: String) -> NetworkId { let mock_network = MockNetwork::new(chain_name, chain_network); let mut networks = self.networks.lock().unwrap(); if let Some(existing_id) = @@ -186,7 +186,7 @@ impl Runtime for Mock { .boxed() } - async fn get_network(&self, network: NetworkId) -> Result> { + async fn get_network(&self, network: NetworkId) -> Result> { Ok(self .networks .lock() @@ -248,7 +248,7 @@ impl Runtime for Mock { Ok(ShardStatus::Created) } - async fn get_shard_commitment(&self, shard_id: ShardId) -> Result> { + async fn get_shard_commitment(&self, shard_id: ShardId) -> Result>> { let shards = self.shards.lock().unwrap(); let Some(shard) = shards.get(&shard_id) else { return Ok(None); @@ -318,7 +318,7 @@ impl Runtime for Mock { async fn submit_commitment( &self, shard_id: ShardId, - commitment: Commitment, + commitment: Vec, _proof_of_knowledge: ProofOfKnowledge, ) -> Result<()> { let mut shards = self.shards.lock().unwrap(); diff --git a/runtimes/mainnet/src/lib.rs b/runtimes/mainnet/src/lib.rs index adbf4ca54..bac6205c4 100644 --- a/runtimes/mainnet/src/lib.rs +++ b/runtimes/mainnet/src/lib.rs @@ -73,7 +73,8 @@ use sp_runtime::{ Verify, }, transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity}, - ApplyExtrinsicResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill, RuntimeDebug, + ApplyExtrinsicResult, BoundedVec, FixedPointNumber, Perbill, Percent, Permill, Perquintill, + RuntimeDebug, }; use sp_std::prelude::*; #[cfg(any(feature = "std", test))] @@ -82,10 +83,10 @@ use sp_version::RuntimeVersion; use static_assertions::const_assert; pub use time_primitives::{ - AccountId, Balance, BatchId, BlockHash, BlockNumber, ChainName, ChainNetwork, Commitment, - ErrorMsg, Gateway, GatewayMessage, MemberStatus, MembersInterface, Moment, NetworkId, - NetworksInterface, Nonce, PeerId, ProofOfKnowledge, PublicKey, ShardId, ShardStatus, Signature, - Task, TaskId, TaskResult, TssPublicKey, TssSignature, ANLOG, + AccountId, Balance, BatchId, BlockHash, BlockNumber, ChainNetwork, Gateway, GatewayMessage, + MemberStatus, MembersInterface, Moment, NetworkId, NetworksInterface, Nonce, PeerId, + ProofOfKnowledge, PublicKey, ShardId, ShardStatus, Signature, Task, TaskId, TaskResult, + TssPublicKey, TssSignature, ANLOG, MAX_ERROR_LEN, MAX_SHARD_SIZE, }; /// weightToFee implementation @@ -1898,7 +1899,7 @@ impl_runtime_apis! { } impl time_primitives::NetworksApi for Runtime { - fn get_network(network_id: NetworkId) -> Option<(ChainName, ChainNetwork)> { + fn get_network(network_id: NetworkId) -> Option { Networks::get_network(network_id) } @@ -1930,7 +1931,7 @@ impl_runtime_apis! { Shards::get_shard_status(shard_id) } - fn get_shard_commitment(shard_id: ShardId) -> Option { + fn get_shard_commitment(shard_id: ShardId) -> Option>> { Shards::get_shard_commitment(shard_id) } } @@ -1948,7 +1949,7 @@ impl_runtime_apis! { Tasks::get_task_submitter(task_id) } - fn get_task_result(task_id: TaskId) -> Option>{ + fn get_task_result(task_id: TaskId) -> Option>>> { Tasks::get_task_result(task_id) } diff --git a/runtimes/testnet/src/lib.rs b/runtimes/testnet/src/lib.rs index d45fac99c..7664adedc 100644 --- a/runtimes/testnet/src/lib.rs +++ b/runtimes/testnet/src/lib.rs @@ -74,10 +74,10 @@ pub use runtime_common::{ }; pub use time_primitives::{ - AccountId, Balance, BatchId, BlockNumber, ChainName, ChainNetwork, Commitment, ErrorMsg, - Gateway, GatewayMessage, MemberStatus, MembersInterface, NetworkId, NetworksInterface, PeerId, - ProofOfKnowledge, PublicKey, ShardId, ShardStatus, Signature, Task, TaskId, TaskResult, - TssPublicKey, TssSignature, ANLOG, + AccountId, Balance, BatchId, BlockNumber, ChainNetwork, Gateway, GatewayMessage, MemberStatus, + MembersInterface, NetworkId, NetworksInterface, PeerId, ProofOfKnowledge, PublicKey, ShardId, + ShardStatus, Signature, Task, TaskId, TaskResult, TssPublicKey, TssSignature, ANLOG, + MAX_ERROR_LEN, MAX_ERROR_LEN, MAX_SHARD_SIZE, }; // A few exports that help ease life for downstream crates. @@ -1427,7 +1427,7 @@ impl_runtime_apis! { } impl time_primitives::NetworksApi for Runtime { - fn get_network(network_id: NetworkId) -> Option<(ChainName, ChainNetwork)> { + fn get_network(network_id: NetworkId) -> Option { Networks::get_network(network_id) } @@ -1459,7 +1459,7 @@ impl_runtime_apis! { Shards::get_shard_status(shard_id) } - fn get_shard_commitment(shard_id: ShardId) -> Option { + fn get_shard_commitment(shard_id: ShardId) -> Option>> { Shards::get_shard_commitment(shard_id) } } @@ -1481,7 +1481,7 @@ impl_runtime_apis! { Tasks::get_task_submitter(task_id) } - fn get_task_result(task_id: TaskId) -> Option>{ + fn get_task_result(task_id: TaskId) -> Option>>>{ Tasks::get_task_result(task_id) }