Skip to content
Snippets Groups Projects
Commit 880c740d authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Resolve "network/gdev-800 branch tests are failing" (!323)

* fix(#298): cucumber tests

* fix: check_metadata.sh + --update

* fix(#298): integration tests for GDev were made with distance evaluation window of 7 blocks
parent 31ef3447
Branches
Tags
1 merge request!323Resolve "network/gdev-800 branch tests are failing"
Pipeline #40308 waiting for manual action
Showing
with 21 additions and 2 deletions
......@@ -118,6 +118,7 @@
},
"parameters": {
"babe_epoch_duration": 30,
"distance_evaluation_period": 7,
"cert_period": 15,
"cert_max_by_issuer": 10,
"cert_min_received_cert_to_issue_cert": 2,
......
......@@ -52,6 +52,7 @@
},
"parameters": {
"babe_epoch_duration": 30,
"distance_evaluation_period": 7,
"cert_period": 15,
"cert_max_by_issuer": 10,
"cert_min_received_cert_to_issue_cert": 2,
......
......@@ -88,6 +88,7 @@
},
"parameters": {
"babe_epoch_duration": 30,
"distance_evaluation_period": 7,
"cert_period": 2,
"cert_max_by_issuer": 10,
"cert_min_received_cert_to_issue_cert": 2,
......
......@@ -81,6 +81,7 @@ fn get_parameters(_parameters_from_file: &Option<GenesisParameters>) -> CommonPa
cert_min_received_cert_to_be_able_to_issue_cert:
parameters::MinReceivedCertToBeAbleToIssueCert::get(),
cert_validity_period: parameters::ValidityPeriod::get(),
distance_evaluation_period: gtest_runtime::parameters::DistanceEvaluationPeriod::get(),
distance_min_accessible_referees: parameters::MinAccessibleReferees::get(),
distance_max_depth: parameters::MaxRefereeDistance::get(),
smith_sub_wot_min_cert_for_membership: parameters::SmithWotMinCertForMembership::get(),
......
......@@ -86,6 +86,7 @@ fn get_parameters(parameters_from_file: &Option<GenesisParameters>) -> CommonPar
cert_min_received_cert_to_be_able_to_issue_cert: parameters_from_file
.cert_min_received_cert_to_issue_cert,
cert_validity_period: parameters_from_file.cert_validity_period,
distance_evaluation_period: parameters_from_file.distance_evaluation_period,
distance_min_accessible_referees: parameters::MinAccessibleReferees::get(),
distance_max_depth: parameters::MaxRefereeDistance::get(),
smith_sub_wot_min_cert_for_membership: parameters_from_file
......@@ -332,6 +333,7 @@ fn get_local_chain_parameters() -> Option<GenesisParameters> {
cert_max_by_issuer: 10,
cert_min_received_cert_to_issue_cert: 2,
cert_validity_period,
distance_evaluation_period: 7,
idty_confirm_period: 40,
idty_creation_period: 50,
membership_period,
......
......@@ -1933,6 +1933,7 @@ pub struct CommonParameters {
pub cert_max_by_issuer: u32,
pub cert_min_received_cert_to_be_able_to_issue_cert: u32,
pub cert_validity_period: u32,
pub distance_evaluation_period: u32,
pub distance_min_accessible_referees: Perbill,
pub distance_max_depth: u32,
pub smith_sub_wot_min_cert_for_membership: u32,
......
......@@ -134,6 +134,7 @@ fn get_parameters(_: &Option<GenesisParameters>) -> CommonParameters {
cert_min_received_cert_to_be_able_to_issue_cert:
parameters::MinReceivedCertToBeAbleToIssueCert::get(),
cert_validity_period: parameters::ValidityPeriod::get(),
distance_evaluation_period: parameters::DistanceEvaluationPeriod::get(),
distance_min_accessible_referees: parameters::MinAccessibleReferees::get(),
distance_max_depth: parameters::MaxRefereeDistance::get(),
smith_sub_wot_min_cert_for_membership: parameters::SmithWotMinCertForMembership::get(),
......
......@@ -51,6 +51,7 @@ pub mod types {
pub cert_max_by_issuer: CertCount,
pub cert_min_received_cert_to_issue_cert: CertCount,
pub cert_validity_period: BlockNumber,
pub distance_evaluation_period: BlockNumber,
pub idty_confirm_period: BlockNumber,
pub idty_creation_period: BlockNumber,
pub membership_period: BlockNumber,
......
......@@ -17,6 +17,8 @@ parameters:
ud_reeval_period: 86400000
# ----- MAIN WOT -----
# Evaluation window size, 100 blocks = 600s = 10 min.
distance_evaluation_period: 100
# Duration to wait between two emitted certifications 14400 blocks = 24h = 1 day.
cert_period: 14400
# Maximum quantity of currently valid certifications emitted by a same issuer. 100 certs.
......
No preview for this file type
......@@ -490,8 +490,7 @@ macro_rules! pallets_config {
impl pallet_distance::Config for Runtime {
type CheckRequestDistanceEvaluation = Wot;
type Currency = Balances;
// 100 blocks
type EvaluationPeriod = frame_support::traits::ConstU32<100>;
type EvaluationPeriod = DistanceEvaluationPeriod;
type EvaluationPrice = frame_support::traits::ConstU64<1000>;
type MaxRefereeDistance = MaxRefereeDistance;
type MinAccessibleReferees = MinAccessibleReferees;
......
......@@ -51,6 +51,7 @@ parameter_types! {
parameter_types! {
pub const MinAccessibleReferees: Perbill = Perbill::from_percent(80);
pub const MaxRefereeDistance: u32 = 5;
pub const DistanceEvaluationPeriod: u32 = 100;
}
// Babe
......
......@@ -204,6 +204,8 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
// Dynamic parameters
pub type EpochDuration = pallet_duniter_test_parameters::BabeEpochDuration<Runtime>;
pub type DistanceEvaluationPeriod =
pallet_duniter_test_parameters::DistanceEvaluationPeriod<Runtime>;
pub type CertPeriod = pallet_duniter_test_parameters::CertPeriod<Runtime>;
pub type MaxByIssuer = pallet_duniter_test_parameters::CertMaxByIssuer<Runtime>;
pub type MinReceivedCertToBeAbleToIssueCert =
......
......@@ -100,6 +100,7 @@ impl ExtBuilder {
cert_max_by_issuer: 10,
cert_min_received_cert_to_issue_cert: 2,
cert_validity_period: 10_000,
distance_evaluation_period: 7,
idty_confirm_period: 40,
idty_creation_period: 50,
membership_period: 100,
......
......@@ -51,6 +51,7 @@ parameter_types! {
parameter_types! {
pub const MinAccessibleReferees: Perbill = Perbill::from_percent(80);
pub const MaxRefereeDistance: u32 = 5;
pub const DistanceEvaluationPeriod: u32 = 100;
}
// Babe
......
......@@ -11,5 +11,9 @@ if cmp -s resources/new_metadata.scale resources/metadata.scale; then
exit 0
else
echo "Metadata file needs to be generated. How to do it? $HOME/.cargo/bin/subxt metadata -f bytes > resources/metadata.scale"
if [ "$1" = "--update" ]; then
mv resources/new_metadata.scale resources/metadata.scale
echo "Metadata file updated automatically (--update option detected)"
fi
exit 1
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment