chore: fix conflicts

getdozer · Oct 9, 2023 · ff37d19 · ff37d19
1 parent b6ed058
commit ff37d19
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 38 deletions.
diff --git a/dozer-types/src/models/ingestion_types.rs b/dozer-types/src/models/ingestion_types.rs
@@ -80,7 +80,7 @@ pub enum GrpcConfigSchemas {
     Path(String),
 }
 
-#[derive(Debug, Serialize, Deserialize, Eq, PartialEq, Clone, Hash, JsonSchema, Default)]
+#[derive(Debug, Serialize, Deserialize, Eq, PartialEq, Clone, Hash, JsonSchema)]
 #[schemars(example = "Self::example")]
 
 pub struct EthConfig {
@@ -337,11 +337,11 @@ impl SchemaExample for S3Storage {
         Self {
             details: s3_details,
             tables: vec![Table {
-                config: Some(TableConfig::CSV(CsvConfig {
+                config: TableConfig::CSV(CsvConfig {
                     path: "path/to/file".to_owned(),
                     extension: ".csv".to_owned(),
                     marker_extension: None,
-                })),
+                }),
                 name: "table_name".to_owned(),
             }],
         }
@@ -494,11 +494,11 @@ impl SchemaExample for LocalStorage {
                 path: "path".to_owned(),
             },
             tables: vec![Table {
-                config: Some(TableConfig::CSV(CsvConfig {
+                config: TableConfig::CSV(CsvConfig {
                     path: "path/to/table".to_owned(),
                     extension: ".csv".to_owned(),
                     marker_extension: None,
-                })),
+                }),
                 name: "table_name".to_owned(),
             }],
         }

diff --git a/json_schemas/connections.json b/json_schemas/connections.json
@@ -82,12 +82,9 @@
         {
           "provider": {
             "Log": {
-              "contracts": [],
               "filter": {
-                "addresses": [],
                 "from_block": 0,
-                "to_block": null,
-                "topics": []
+                "to_block": null
               },
               "wss_url": ""
             }
@@ -127,7 +124,6 @@
           "type": "object",
           "properties": {
             "addresses": {
-              "default": [],
               "type": "array",
               "items": {
                 "type": "string"
@@ -150,7 +146,6 @@
               "minimum": 0.0
             },
             "topics": {
-              "default": [],
               "type": "array",
               "items": {
                 "type": "string"
@@ -165,7 +160,6 @@
           ],
           "properties": {
             "contracts": {
-              "default": [],
               "type": "array",
               "items": {
                 "$ref": "#/definitions/EthContract"
@@ -543,18 +537,12 @@
         "Table": {
           "type": "object",
           "required": [
+            "config",
             "name"
           ],
           "properties": {
             "config": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/TableConfig"
-                },
-                {
-                  "type": "null"
-                }
-              ]
+              "$ref": "#/definitions/TableConfig"
             },
             "name": {
               "type": "string"
@@ -711,18 +699,12 @@
         "Table": {
           "type": "object",
           "required": [
+            "config",
             "name"
           ],
           "properties": {
             "config": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/TableConfig"
-                },
-                {
-                  "type": "null"
-                }
-              ]
+              "$ref": "#/definitions/TableConfig"
             },
             "name": {
               "type": "string"
@@ -880,12 +862,7 @@
       ],
       "properties": {
         "log_options": {
-          "default": {},
-          "allOf": [
-            {
-              "$ref": "#/definitions/NestedDozerLogOptions"
-            }
-          ]
+          "$ref": "#/definitions/NestedDozerLogOptions"
         },
         "url": {
           "type": "string"

diff --git a/json_schemas/dozer.json b/json_schemas/dozer.json
@@ -726,12 +726,9 @@
         {
           "provider": {
             "Log": {
-              "contracts": [],
               "filter": {
-                "addresses": [],
                 "from_block": 0,
-                "to_block": null,
-                "topics": []
+                "to_block": null
               },
               "wss_url": ""
             }