VDB-1653 - add COMP, LINK, LRC to beta by elizabethengelman · Pull Request #324 · sky-ecosystem/vdb-mcd-transformers

elizabethengelman · 2020-09-28T15:06:59Z

No description provided.

And instead use the docker.toml file and merge in test specific database specifics for testing. For local development this means we'll need to pass in docker.toml, and then set db params via env vars.

rmulhol

Awesome refactor! Have you been able to run compose with just the one config file? Wondering if we might want to update something in the docs to explain how to use env vars for providing a DB connection when the main config is only transformers + addresses

rmulhol · 2020-09-28T22:19:50Z

transformers/integration_tests/integration_tests_suite_test.go

-	testConfig.SetConfigName("testing")
+	testConfig.SetConfigName("docker")
 	testConfig.AddConfigPath("$GOPATH/src/github.com/makerdao/vdb-mcd-transformers/environments/")
 	err := testConfig.ReadInConfig()


How does the DB get set for the integration tests?

Great question - we're calling test_config.SetTestConfig in the 0.go file, which sets the db info. I think we must be loading 0.go somewhere in setting up the integration test suite. I'll try to see if I can call test_config.SetTestConfig more explicitly so that it's clearer.

Ohhhh, so on line 47, we're calling db = test_config.NewTestDB(blockChain.Node()) which initializes the test_config.go file, which sets the test config via SetTestConfig. I'll plan to add a comment explaining this.

rmulhol · 2020-09-28T22:20:49Z

environments/docker.toml

+    [contract.OSM_LRC]
+        address  = "0x9eb923339c24c40Bef2f4AF4961742AA7C23EF3a"
+        abi      = '[{"inputs":[{"internalType":"address","name":"src_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"bytes4","name":"sig","type":"bytes4"},{"indexed":true,"internalType":"address","name":"usr","type":"address"},{"indexed":true,"internalType":"bytes32","name":"arg1","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"arg2","type":"bytes32"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"LogNote","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"val","type":"bytes32"}],"name":"LogValue","type":"event"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"bud","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"src_","type":"address"}],"name":"change","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"hop","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"pass","outputs":[{"internalType":"bool","name":"ok","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peek","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peep","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"poke","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"read","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"src","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"start","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint16","name":"ts","type":"uint16"}],"name":"step","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"stop","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"stopped","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"void","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"wards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"zzz","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"payable":false,"stateMutability":"view","type":"function"}]'
+        deployed = 10933898
    [contract.OSM_MANA]
        address  = "0x8067259EA630601f319FccE477977E55C6078C13"
        abi      = '[{"inputs":[{"internalType":"address","name":"src_","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":true,"inputs":[{"indexed":true,"internalType":"bytes4","name":"sig","type":"bytes4"},{"indexed":true,"internalType":"address","name":"usr","type":"address"},{"indexed":true,"internalType":"bytes32","name":"arg1","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"arg2","type":"bytes32"},{"indexed":false,"internalType":"bytes","name":"data","type":"bytes"}],"name":"LogNote","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"bytes32","name":"val","type":"bytes32"}],"name":"LogValue","type":"event"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"bud","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"src_","type":"address"}],"name":"change","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"deny","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"diss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"hop","outputs":[{"internalType":"uint16","name":"","type":"uint16"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address[]","name":"a","type":"address[]"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"a","type":"address"}],"name":"kiss","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"pass","outputs":[{"internalType":"bool","name":"ok","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peek","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"peep","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"},{"internalType":"bool","name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"poke","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"read","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"internalType":"address","name":"usr","type":"address"}],"name":"rely","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"src","outputs":[{"internalType":"address","name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"start","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"internalType":"uint16","name":"ts","type":"uint16"}],"name":"step","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"stop","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"stopped","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"void","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"wards","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"zzz","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"payable":false,"stateMutability":"view","type":"function"}]'


maybe it makes sense to rename this file if it's being used for tests as well?

👍 that makes sense!

since it's now being used for testing and local development in addition to docker now

elizabethengelman · 2020-09-29T19:57:29Z

@rmulhol Just tested out compose and execute, and they both work. Made a small update to the README, but happy to expand upon that as well.

elizabethengelman added 2 commits September 25, 2020 10:13

Use test_config.SetTestConfig() in 0.go

a9646bb

Remove testing.toml and mcdTransformers.toml config files

aedda44

And instead use the docker.toml file and merge in test specific database specifics for testing. For local development this means we'll need to pass in docker.toml, and then set db params via env vars.

elizabethengelman force-pushed the vdb-1653-new-collaterals branch 5 times, most recently from 89e4f92 to d121125 Compare September 28, 2020 19:17

elizabethengelman changed the title ~~Vdb 1653 new collaterals~~ VDB-1653 new collaterals (COMP, LINK, LRC) Sep 28, 2020

elizabethengelman marked this pull request as ready for review September 28, 2020 19:39

elizabethengelman mentioned this pull request Sep 28, 2020

Vdb 1653 backfill events #325

Merged

elizabethengelman added 3 commits September 28, 2020 15:10

Add COMP

e7915a6

Add LINK

d5ba056

Add LRC

f051c9c

elizabethengelman force-pushed the vdb-1653-new-collaterals branch from d121125 to f051c9c Compare September 28, 2020 20:11

elizabethengelman changed the title ~~VDB-1653 new collaterals (COMP, LINK, LRC)~~ VDB-1653 - add COMP, LINK, LRC to beta Sep 28, 2020

elizabethengelman requested review from paytonrules, rmulhol and yaoandrew September 28, 2020 20:11

rmulhol approved these changes Sep 28, 2020

View reviewed changes

elizabethengelman added 3 commits September 29, 2020 11:35

Clarify test config setup in integration tests

61e41c0

Rename docker.toml -> mcdTransformers.toml

e03b26c

since it's now being used for testing and local development in addition to docker now

Update README to account for new config file setup

47b1c9b

elizabethengelman force-pushed the vdb-1653-new-collaterals branch from b0cc91d to 47b1c9b Compare September 29, 2020 19:51

elizabethengelman merged commit 03cb8da into beta Sep 29, 2020

elizabethengelman deleted the vdb-1653-new-collaterals branch September 29, 2020 20:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VDB-1653 - add COMP, LINK, LRC to beta#324

VDB-1653 - add COMP, LINK, LRC to beta#324
elizabethengelman merged 8 commits intobetafrom
vdb-1653-new-collaterals

elizabethengelman commented Sep 28, 2020

Uh oh!

rmulhol left a comment

Uh oh!

rmulhol Sep 28, 2020

Uh oh!

elizabethengelman Sep 29, 2020

Uh oh!

elizabethengelman Sep 29, 2020

Uh oh!

rmulhol Sep 28, 2020

Uh oh!

elizabethengelman Sep 29, 2020

Uh oh!

elizabethengelman commented Sep 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

elizabethengelman commented Sep 28, 2020

Uh oh!

rmulhol left a comment

Choose a reason for hiding this comment

Uh oh!

rmulhol Sep 28, 2020

Choose a reason for hiding this comment

Uh oh!

elizabethengelman Sep 29, 2020

Choose a reason for hiding this comment

Uh oh!

elizabethengelman Sep 29, 2020

Choose a reason for hiding this comment

Uh oh!

rmulhol Sep 28, 2020

Choose a reason for hiding this comment

Uh oh!

elizabethengelman Sep 29, 2020

Choose a reason for hiding this comment

Uh oh!

elizabethengelman commented Sep 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants