Merge pull request #761 from input-output-hk/jpraynaud/760-ci-dynamic-matrix-eras

Add dynamic matrix in CI for end to end tests

Author: jpraynaud

.github/workflows/ci.yml

@@ -21,6 +21,8 @@ concurrency:
 jobs:
   build-ubuntu-X64:
     runs-on: ubuntu-22.04
+    outputs:
+      eras: ${{ steps.eras-test-lab.outputs.eras }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -59,6 +61,13 @@ jobs:
           name: mithril-end-to-end-${{ runner.os }}-${{ runner.arch }}
           path: target/release/mithril-end-to-end
           if-no-files-found: error
+
+      - name: Prepare test lab eras
+        id: eras-test-lab
+        run: |
+          ERAS=$(./target/release/mithril-aggregator era list --json)
+          echo "Test Lab Eras: $ERAS"
+          echo "eras=$ERAS" >> $GITHUB_OUTPUT
   
   build:
     strategy:
@@ -178,7 +187,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        era: [ thales ]
+        era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras) }}
         run_id: [1,2,3]
     steps:
       - name: Checkout sources

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.2.20"
+version = "0.2.21"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.2.17"
+version = "0.2.18"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }

mithril-common/Cargo.toml

@@ -69,11 +69,12 @@ impl TxDatum {
 
 /// [TxDatumFieldValue] represents a fiel value of TxDatum.
 #[derive(Debug, EnumDiscriminants, Serialize, Display)]
-#[serde(untagged)]
+#[serde(untagged, rename_all = "lowercase")]
 #[strum(serialize_all = "lowercase")]
-#[strum_discriminants(derive(Serialize, Display))]
+#[strum_discriminants(derive(Serialize, Hash, Display))]
 #[strum_discriminants(name(TxDatumFieldTypeName))]
 #[strum_discriminants(strum(serialize_all = "lowercase"))]
+#[strum_discriminants(serde(rename_all = "lowercase"))]
 pub enum TxDatumFieldValue {
     /// Bytes datum field value.
     Bytes(String),
@@ -86,7 +87,7 @@ pub enum TxDatumFieldValue {
 #[derive(Debug, Serialize)]
 pub struct TxDatumBuilder {
     constructor: usize,
-    fields: Vec<HashMap<String, TxDatumFieldValue>>,
+    fields: Vec<HashMap<TxDatumFieldTypeName, TxDatumFieldValue>>,
 }
 
 impl TxDatumBuilder {
@@ -101,10 +102,7 @@ impl TxDatumBuilder {
     /// Add a field to the builder
     pub fn add_field(&mut self, field_value: TxDatumFieldValue) -> &mut TxDatumBuilder {
         let mut field = HashMap::new();
-        field.insert(
-            TxDatumFieldTypeName::from(&field_value).to_string(),
-            field_value,
-        );
+        field.insert(TxDatumFieldTypeName::from(&field_value), field_value);
         self.fields.push(field);
 
         self

mithril-common/src/chain_observer/model.rs

@@ -9,6 +9,7 @@ pub type UnsupportedEraError = strum::ParseError;
 #[derive(
     Display, EnumString, EnumIter, Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize,
 )]
+#[serde(rename_all = "lowercase")]
 #[strum(serialize_all = "lowercase")]
 pub enum SupportedEra {
     /// Thales era