Skip to content

Commit

Permalink
Merge pull request #73 from Bisonai/feat/remove-address-from-config
Browse files Browse the repository at this point in the history
Remove address attribute from configs
  • Loading branch information
nick-bisonai authored May 20, 2024
2 parents d21dcb8 + ab5a9eb commit 6953180
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 35 deletions.
4 changes: 1 addition & 3 deletions script/collect-files.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ def collect_json_files(directory: Path, output_file_path: str):
def filter_invalid_configs(configs: list):
result = []
for config in configs:
if "address" not in config or config["address"] == "":
continue
if "feeds" not in config or len(config["feeds"]) == 0:
continue
result.append(config)
Expand All @@ -47,7 +45,7 @@ def generate_config_file(adapter_path: Path, aggregator_path: Path, output_file_
for aggregator in aggregators:
if aggregator["name"] not in temp_result:
temp_result[aggregator["name"]] = {}
temp_result[aggregator["name"]]["address"] = aggregator["address"]

temp_result[aggregator["name"]]["aggregateInterval"] = aggregator["aggregateHeartbeat"] if "aggregateHeartbeat" in aggregator else 5000
temp_result[aggregator["name"]]["submitInterval"] = aggregator["heartbeat"] if "heartbeat" in aggregator else 15000

Expand Down
32 changes: 0 additions & 32 deletions test_configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
}
],
"fetchInterval": 2000,
"address": "0x23c95F4842AC01A6Eca3381005C5749f575eA801",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -483,7 +482,6 @@
}
],
"fetchInterval": 2000,
"address": "0x097dD2cBcB60B6Bc77D53DA86B6D6EB276BdFBc0",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -727,7 +725,6 @@
}
],
"fetchInterval": 2000,
"address": "0x38d0f2A1D9f497583eCbe9881B9B10b329dDA93e",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -945,7 +942,6 @@
}
],
"fetchInterval": 2000,
"address": "0x63606c0B4b330338a99abf2EBC61DBA10489E9E1",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -1069,7 +1065,6 @@
}
],
"fetchInterval": 2000,
"address": "0x3830560e3F58146b0A151dF8FBB4fFAD792c72FA",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -1313,7 +1308,6 @@
}
],
"fetchInterval": 2000,
"address": "0x55faF24D49026be2bE81286783bD4605E0574bBd",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -1426,7 +1420,6 @@
}
],
"fetchInterval": 2000,
"address": "0xD8445E69de89B6c5A70eF54336BCE306531Bcc1c",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -1589,7 +1582,6 @@
}
],
"fetchInterval": 2000,
"address": "0xc22Cd928deFce14292986aCE75a1BE1bcF100697",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -1833,7 +1825,6 @@
}
],
"fetchInterval": 2000,
"address": "0x4470866FE5265841a56795AA28842d0e9f04E770",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2050,7 +2041,6 @@
}
],
"fetchInterval": 2000,
"address": "0x8cd9A106CAAFA3bFD2da9a0CB22A206E342E3488",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2294,7 +2284,6 @@
}
],
"fetchInterval": 2000,
"address": "0xB9048ca2b573A36E0Dd627d626dc772607a6922f",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2407,7 +2396,6 @@
}
],
"fetchInterval": 2000,
"address": "0x5018dfF84b02Ed9c399daaC9ee6da97e74b8DedF",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2624,7 +2612,6 @@
}
],
"fetchInterval": 2000,
"address": "0x98087cb55f5b5Cb686aBA262C9727307438F71f1",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2737,7 +2724,6 @@
}
],
"fetchInterval": 2000,
"address": "0xc5646e63c1301F926084572A32afECe89d52E2D4",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2835,7 +2821,6 @@
}
],
"fetchInterval": 2000,
"address": "0x10616d461033442395407CE7f0122E1C8ba432F1",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -2956,7 +2941,6 @@
}
],
"fetchInterval": 2000,
"address": "0x4E5e0906eadDD310D885eBa48E2728a93EB6Fd77",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3200,7 +3184,6 @@
}
],
"fetchInterval": 2000,
"address": "0x1CE805c8714cf74a6b92Cc3940b40De6d680EA71",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3355,7 +3338,6 @@
}
],
"fetchInterval": 2000,
"address": "0xf83d263a028b1cf087975096E697851631Cae7a4",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3424,7 +3406,6 @@
}
],
"fetchInterval": 2000,
"address": "0x24d45f4037551dc2688D7ff071bd4CdB432EB9eF",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3641,7 +3622,6 @@
}
],
"fetchInterval": 2000,
"address": "0xb5313C2ca09C349F94871447c2e90d3DA2F02347",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3868,7 +3848,6 @@
}
],
"fetchInterval": 2000,
"address": "0x1BA7385Fa4a0FF460edF433701b29565f0F02D79",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3903,7 +3882,6 @@
}
],
"fetchInterval": 2000,
"address": "0xf29Dd42Be0C2b2B12275704846b1337ec23b4684",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -3947,7 +3925,6 @@
}
],
"fetchInterval": 2000,
"address": "0x8A6e92c4975f9F356a2a1a150F479F25bEB42B5e",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -4106,7 +4083,6 @@
}
],
"fetchInterval": 2000,
"address": "0xAD3C7697075AD6256AA8Be04866b503feE7Ce365",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand All @@ -4126,7 +4102,6 @@
}
],
"fetchInterval": 2000,
"address": "0x8Fac04786dCB20FBbCB7Fab50FB10d68EB2B5C6C",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -4334,7 +4309,6 @@
}
],
"fetchInterval": 2000,
"address": "0x4c002d4B6596D6Ec4C0D430605c95Cb52932DE4F",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -4578,7 +4552,6 @@
}
],
"fetchInterval": 2000,
"address": "0x6B816501CEa5D6D491554663507fA3e1878BF524",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -4759,7 +4732,6 @@
}
],
"fetchInterval": 2000,
"address": "0x74866B7B114385F147c72D5A78C9C1a99D8C68a5",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -5013,7 +4985,6 @@
}
],
"fetchInterval": 2000,
"address": "0x7B7E3f80bA7F93f0a21D0ca3a44e8F2C0E22D9fe",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -5202,7 +5173,6 @@
}
],
"fetchInterval": 2000,
"address": "0xc65478cef5f9200f56fB0cd9307BF6d1AD2BaEB1",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -5402,7 +5372,6 @@
}
],
"fetchInterval": 2000,
"address": "0x863401dBb12238d33A24B1BbBFA607441F395722",
"aggregateInterval": 5000,
"submitInterval": 15000
},
Expand Down Expand Up @@ -5646,7 +5615,6 @@
}
],
"fetchInterval": 2000,
"address": "0x3125751E281301215E0839fF50Fa84cAAE82Cd33",
"aggregateInterval": 5000,
"submitInterval": 15000
}
Expand Down

0 comments on commit 6953180

Please sign in to comment.