diff --git a/cmd/contractWatcher.go b/cmd/contractWatcher.go index cbfe818f..ae1c0ca7 100644 --- a/cmd/contractWatcher.go +++ b/cmd/contractWatcher.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" st "github.com/vulcanize/vulcanizedb/libraries/shared/transformer" - ft "github.com/vulcanize/vulcanizedb/pkg/omni/full/transformer" - lt "github.com/vulcanize/vulcanizedb/pkg/omni/light/transformer" + ft "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/transformer" + lt "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/transformer" "github.com/vulcanize/vulcanizedb/utils" ) diff --git a/integration_test/omni_full_transformer_test.go b/integration_test/omni_full_transformer_test.go index cdfb93ae..1da30e73 100644 --- a/integration_test/omni_full_transformer_test.go +++ b/integration_test/omni_full_transformer_test.go @@ -11,13 +11,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/transformer" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/transformer" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Omni full transformer", func() { diff --git a/integration_test/omni_light_transformer_test.go b/integration_test/omni_light_transformer_test.go index 6cc8bb93..c0efd79d 100644 --- a/integration_test/omni_light_transformer_test.go +++ b/integration_test/omni_light_transformer_test.go @@ -9,13 +9,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/transformer" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/transformer" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Omnit light transformer", func() { diff --git a/libraries/shared/repository/repository_test.go b/libraries/shared/repository/repository_test.go index 1a9977d0..ccf6257f 100644 --- a/libraries/shared/repository/repository_test.go +++ b/libraries/shared/repository/repository_test.go @@ -26,12 +26,12 @@ import ( "github.com/vulcanize/vulcanizedb/libraries/shared/constants" shared "github.com/vulcanize/vulcanizedb/libraries/shared/repository" + r2 "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/repository" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" "github.com/vulcanize/vulcanizedb/pkg/fakes" - r2 "github.com/vulcanize/vulcanizedb/pkg/omni/light/repository" "github.com/vulcanize/vulcanizedb/test_config" ) diff --git a/pkg/omni/full/converter/converter.go b/pkg/contract_watcher/full/converter/converter.go similarity index 94% rename from pkg/omni/full/converter/converter.go rename to pkg/contract_watcher/full/converter/converter.go index 1c615c33..47f3fa42 100644 --- a/pkg/omni/full/converter/converter.go +++ b/pkg/contract_watcher/full/converter/converter.go @@ -26,10 +26,10 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Converter is used to convert watched event logs to diff --git a/pkg/omni/full/converter/converter_suite_test.go b/pkg/contract_watcher/full/converter/converter_suite_test.go similarity index 100% rename from pkg/omni/full/converter/converter_suite_test.go rename to pkg/contract_watcher/full/converter/converter_suite_test.go diff --git a/pkg/omni/full/converter/converter_test.go b/pkg/contract_watcher/full/converter/converter_test.go similarity index 89% rename from pkg/omni/full/converter/converter_test.go rename to pkg/contract_watcher/full/converter/converter_test.go index 8fa7b8f5..9b7a46cb 100644 --- a/pkg/omni/full/converter/converter_test.go +++ b/pkg/contract_watcher/full/converter/converter_test.go @@ -21,11 +21,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/converter" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/converter" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" ) var _ = Describe("Converter", func() { diff --git a/pkg/omni/full/retriever/block_retriever.go b/pkg/contract_watcher/full/retriever/block_retriever.go similarity index 100% rename from pkg/omni/full/retriever/block_retriever.go rename to pkg/contract_watcher/full/retriever/block_retriever.go diff --git a/pkg/omni/full/retriever/block_retriever_test.go b/pkg/contract_watcher/full/retriever/block_retriever_test.go similarity index 97% rename from pkg/omni/full/retriever/block_retriever_test.go rename to pkg/contract_watcher/full/retriever/block_retriever_test.go index dcd13c35..4cc4c04e 100644 --- a/pkg/omni/full/retriever/block_retriever_test.go +++ b/pkg/contract_watcher/full/retriever/block_retriever_test.go @@ -21,12 +21,12 @@ import ( . "github.com/onsi/gomega" "strings" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/retriever" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/retriever" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" ) var _ = Describe("Block Retriever", func() { diff --git a/pkg/omni/full/retriever/retriever_suite_test.go b/pkg/contract_watcher/full/retriever/retriever_suite_test.go similarity index 100% rename from pkg/omni/full/retriever/retriever_suite_test.go rename to pkg/contract_watcher/full/retriever/retriever_suite_test.go diff --git a/pkg/omni/full/transformer/transformer.go b/pkg/contract_watcher/full/transformer/transformer.go similarity index 93% rename from pkg/omni/full/transformer/transformer.go rename to pkg/contract_watcher/full/transformer/transformer.go index 6d51bdb1..119aa6ec 100644 --- a/pkg/omni/full/transformer/transformer.go +++ b/pkg/contract_watcher/full/transformer/transformer.go @@ -20,17 +20,17 @@ import ( "errors" "github.com/vulcanize/vulcanizedb/pkg/config" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/converter" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/retriever" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/parser" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/poller" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/converter" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/retriever" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/parser" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/poller" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Requires a fully synced vDB and a running eth node (or infura) diff --git a/pkg/omni/full/transformer/transformer_suite_test.go b/pkg/contract_watcher/full/transformer/transformer_suite_test.go similarity index 100% rename from pkg/omni/full/transformer/transformer_suite_test.go rename to pkg/contract_watcher/full/transformer/transformer_suite_test.go diff --git a/pkg/omni/full/transformer/transformer_test.go b/pkg/contract_watcher/full/transformer/transformer_test.go similarity index 97% rename from pkg/omni/full/transformer/transformer_test.go rename to pkg/contract_watcher/full/transformer/transformer_test.go index e302b6f5..ee6d465e 100644 --- a/pkg/omni/full/transformer/transformer_test.go +++ b/pkg/contract_watcher/full/transformer/transformer_test.go @@ -27,13 +27,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/transformer" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/transformer" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Transformer", func() { diff --git a/pkg/omni/light/converter/converter.go b/pkg/contract_watcher/light/converter/converter.go similarity index 97% rename from pkg/omni/light/converter/converter.go rename to pkg/contract_watcher/light/converter/converter.go index 36c18f68..b938c61e 100644 --- a/pkg/omni/light/converter/converter.go +++ b/pkg/contract_watcher/light/converter/converter.go @@ -28,8 +28,8 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" gethTypes "github.com/ethereum/go-ethereum/core/types" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" ) type Converter interface { diff --git a/pkg/omni/light/converter/converter_suite_test.go b/pkg/contract_watcher/light/converter/converter_suite_test.go similarity index 100% rename from pkg/omni/light/converter/converter_suite_test.go rename to pkg/contract_watcher/light/converter/converter_suite_test.go diff --git a/pkg/omni/light/converter/converter_test.go b/pkg/contract_watcher/light/converter/converter_test.go similarity index 93% rename from pkg/omni/light/converter/converter_test.go rename to pkg/contract_watcher/light/converter/converter_test.go index 67c9950d..fb29c556 100644 --- a/pkg/omni/light/converter/converter_test.go +++ b/pkg/contract_watcher/light/converter/converter_test.go @@ -22,11 +22,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/converter" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/converter" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" ) var _ = Describe("Converter", func() { diff --git a/pkg/omni/light/fetcher/fetcher.go b/pkg/contract_watcher/light/fetcher/fetcher.go similarity index 100% rename from pkg/omni/light/fetcher/fetcher.go rename to pkg/contract_watcher/light/fetcher/fetcher.go diff --git a/pkg/omni/light/fetcher/fetcher_suite_test.go b/pkg/contract_watcher/light/fetcher/fetcher_suite_test.go similarity index 100% rename from pkg/omni/light/fetcher/fetcher_suite_test.go rename to pkg/contract_watcher/light/fetcher/fetcher_suite_test.go diff --git a/pkg/omni/light/fetcher/fetcher_test.go b/pkg/contract_watcher/light/fetcher/fetcher_test.go similarity index 96% rename from pkg/omni/light/fetcher/fetcher_test.go rename to pkg/contract_watcher/light/fetcher/fetcher_test.go index 77982d84..b3b9b96c 100644 --- a/pkg/omni/light/fetcher/fetcher_test.go +++ b/pkg/contract_watcher/light/fetcher/fetcher_test.go @@ -22,9 +22,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/fetcher" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/fakes" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/fetcher" ) var _ = Describe("Fetcher", func() { diff --git a/pkg/omni/light/repository/header_repository.go b/pkg/contract_watcher/light/repository/header_repository.go similarity index 100% rename from pkg/omni/light/repository/header_repository.go rename to pkg/contract_watcher/light/repository/header_repository.go diff --git a/pkg/omni/light/repository/header_repository_test.go b/pkg/contract_watcher/light/repository/header_repository_test.go similarity index 97% rename from pkg/omni/light/repository/header_repository_test.go rename to pkg/contract_watcher/light/repository/header_repository_test.go index 6c4958b7..60aabf39 100644 --- a/pkg/omni/light/repository/header_repository_test.go +++ b/pkg/contract_watcher/light/repository/header_repository_test.go @@ -23,11 +23,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Repository", func() { diff --git a/pkg/omni/light/repository/repository_suite_test.go b/pkg/contract_watcher/light/repository/repository_suite_test.go similarity index 100% rename from pkg/omni/light/repository/repository_suite_test.go rename to pkg/contract_watcher/light/repository/repository_suite_test.go diff --git a/pkg/omni/light/retriever/block_retriever.go b/pkg/contract_watcher/light/retriever/block_retriever.go similarity index 100% rename from pkg/omni/light/retriever/block_retriever.go rename to pkg/contract_watcher/light/retriever/block_retriever.go diff --git a/pkg/omni/light/retriever/block_retriever_test.go b/pkg/contract_watcher/light/retriever/block_retriever_test.go similarity index 90% rename from pkg/omni/light/retriever/block_retriever_test.go rename to pkg/contract_watcher/light/retriever/block_retriever_test.go index d9066b92..a57852e5 100644 --- a/pkg/omni/light/retriever/block_retriever_test.go +++ b/pkg/contract_watcher/light/retriever/block_retriever_test.go @@ -20,11 +20,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/retriever" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/retriever" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Block Retriever", func() { diff --git a/pkg/omni/light/retriever/retriever_suite_test.go b/pkg/contract_watcher/light/retriever/retriever_suite_test.go similarity index 100% rename from pkg/omni/light/retriever/retriever_suite_test.go rename to pkg/contract_watcher/light/retriever/retriever_suite_test.go diff --git a/pkg/omni/light/transformer/transformer.go b/pkg/contract_watcher/light/transformer/transformer.go similarity index 94% rename from pkg/omni/light/transformer/transformer.go rename to pkg/contract_watcher/light/transformer/transformer.go index b0d4f37d..d3daa48a 100644 --- a/pkg/omni/light/transformer/transformer.go +++ b/pkg/contract_watcher/light/transformer/transformer.go @@ -24,17 +24,17 @@ import ( "github.com/ethereum/go-ethereum/common" gethTypes "github.com/ethereum/go-ethereum/core/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/converter" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/fetcher" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/retriever" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/parser" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/poller" + srep "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/converter" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/fetcher" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/retriever" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/parser" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/poller" - srep "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Requires a light synced vDB (headers) and a running eth node (or infura) diff --git a/pkg/omni/light/transformer/transformer_suite_test.go b/pkg/contract_watcher/light/transformer/transformer_suite_test.go similarity index 100% rename from pkg/omni/light/transformer/transformer_suite_test.go rename to pkg/contract_watcher/light/transformer/transformer_suite_test.go diff --git a/pkg/omni/light/transformer/transformer_test.go b/pkg/contract_watcher/light/transformer/transformer_test.go similarity index 98% rename from pkg/omni/light/transformer/transformer_test.go rename to pkg/contract_watcher/light/transformer/transformer_test.go index 093cd5f2..8e5902e4 100644 --- a/pkg/omni/light/transformer/transformer_test.go +++ b/pkg/contract_watcher/light/transformer/transformer_test.go @@ -25,13 +25,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/transformer" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/transformer" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) var _ = Describe("Transformer", func() { diff --git a/pkg/omni/shared/constants/constants.go b/pkg/contract_watcher/shared/constants/constants.go similarity index 99% rename from pkg/omni/shared/constants/constants.go rename to pkg/contract_watcher/shared/constants/constants.go index 86012222..5545f791 100644 --- a/pkg/omni/shared/constants/constants.go +++ b/pkg/contract_watcher/shared/constants/constants.go @@ -18,9 +18,9 @@ package constants import ( "github.com/ethereum/go-ethereum/common" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/filters" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers" ) // Event enums diff --git a/pkg/omni/shared/constants/interface.go b/pkg/contract_watcher/shared/constants/interface.go similarity index 100% rename from pkg/omni/shared/constants/interface.go rename to pkg/contract_watcher/shared/constants/interface.go diff --git a/pkg/omni/shared/contract/contract.go b/pkg/contract_watcher/shared/contract/contract.go similarity index 98% rename from pkg/omni/shared/contract/contract.go rename to pkg/contract_watcher/shared/contract/contract.go index e9f06fb2..d6f62d0a 100644 --- a/pkg/omni/shared/contract/contract.go +++ b/pkg/contract_watcher/shared/contract/contract.go @@ -23,9 +23,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/filters" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Contract object to hold our contract data diff --git a/pkg/omni/shared/contract/contract_suite_test.go b/pkg/contract_watcher/shared/contract/contract_suite_test.go similarity index 100% rename from pkg/omni/shared/contract/contract_suite_test.go rename to pkg/contract_watcher/shared/contract/contract_suite_test.go diff --git a/pkg/omni/shared/contract/contract_test.go b/pkg/contract_watcher/shared/contract/contract_test.go similarity index 95% rename from pkg/omni/shared/contract/contract_test.go rename to pkg/contract_watcher/shared/contract/contract_test.go index 819e6959..38a996ec 100644 --- a/pkg/omni/shared/contract/contract_test.go +++ b/pkg/contract_watcher/shared/contract/contract_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" ) var _ = Describe("Contract", func() { diff --git a/pkg/omni/shared/fetcher/fetcher.go b/pkg/contract_watcher/shared/fetcher/fetcher.go similarity index 100% rename from pkg/omni/shared/fetcher/fetcher.go rename to pkg/contract_watcher/shared/fetcher/fetcher.go diff --git a/pkg/omni/shared/getter/getter_suite_test.go b/pkg/contract_watcher/shared/getter/getter_suite_test.go similarity index 100% rename from pkg/omni/shared/getter/getter_suite_test.go rename to pkg/contract_watcher/shared/getter/getter_suite_test.go diff --git a/pkg/omni/shared/getter/getter_test.go b/pkg/contract_watcher/shared/getter/getter_test.go similarity index 94% rename from pkg/omni/shared/getter/getter_test.go rename to pkg/contract_watcher/shared/getter/getter_test.go index 730767db..c84560ce 100644 --- a/pkg/omni/shared/getter/getter_test.go +++ b/pkg/contract_watcher/shared/getter/getter_test.go @@ -22,12 +22,12 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/getter" "github.com/vulcanize/vulcanizedb/pkg/geth" "github.com/vulcanize/vulcanizedb/pkg/geth/client" rpc2 "github.com/vulcanize/vulcanizedb/pkg/geth/converters/rpc" "github.com/vulcanize/vulcanizedb/pkg/geth/node" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/getter" ) var _ = Describe("Interface Getter", func() { diff --git a/pkg/omni/shared/getter/interface_getter.go b/pkg/contract_watcher/shared/getter/interface_getter.go similarity index 96% rename from pkg/omni/shared/getter/interface_getter.go rename to pkg/contract_watcher/shared/getter/interface_getter.go index 70fc8273..8aee7d03 100644 --- a/pkg/omni/shared/getter/interface_getter.go +++ b/pkg/contract_watcher/shared/getter/interface_getter.go @@ -17,9 +17,9 @@ package getter import ( + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/fetcher" "github.com/vulcanize/vulcanizedb/pkg/core" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/fetcher" ) type InterfaceGetter interface { diff --git a/pkg/omni/shared/helpers/helpers.go b/pkg/contract_watcher/shared/helpers/helpers.go similarity index 100% rename from pkg/omni/shared/helpers/helpers.go rename to pkg/contract_watcher/shared/helpers/helpers.go diff --git a/pkg/omni/shared/helpers/test_helpers/database.go b/pkg/contract_watcher/shared/helpers/test_helpers/database.go similarity index 97% rename from pkg/omni/shared/helpers/test_helpers/database.go rename to pkg/contract_watcher/shared/helpers/test_helpers/database.go index 8a1620f7..69ed26a3 100644 --- a/pkg/omni/shared/helpers/test_helpers/database.go +++ b/pkg/contract_watcher/shared/helpers/test_helpers/database.go @@ -24,6 +24,9 @@ import ( . "github.com/onsi/gomega" "github.com/vulcanize/vulcanizedb/pkg/config" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" @@ -31,9 +34,6 @@ import ( "github.com/vulcanize/vulcanizedb/pkg/geth/client" rpc2 "github.com/vulcanize/vulcanizedb/pkg/geth/converters/rpc" "github.com/vulcanize/vulcanizedb/pkg/geth/node" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" ) type TransferLog struct { diff --git a/pkg/omni/shared/helpers/test_helpers/mocks/entities.go b/pkg/contract_watcher/shared/helpers/test_helpers/mocks/entities.go similarity index 99% rename from pkg/omni/shared/helpers/test_helpers/mocks/entities.go rename to pkg/contract_watcher/shared/helpers/test_helpers/mocks/entities.go index 1829448b..debcc8dc 100644 --- a/pkg/omni/shared/helpers/test_helpers/mocks/entities.go +++ b/pkg/contract_watcher/shared/helpers/test_helpers/mocks/entities.go @@ -25,9 +25,9 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/filters" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" ) var TransferBlock1 = core.Block{ diff --git a/pkg/omni/shared/helpers/test_helpers/mocks/parser.go b/pkg/contract_watcher/shared/helpers/test_helpers/mocks/parser.go similarity index 98% rename from pkg/omni/shared/helpers/test_helpers/mocks/parser.go rename to pkg/contract_watcher/shared/helpers/test_helpers/mocks/parser.go index 5dd5d2e8..6ea0948d 100644 --- a/pkg/omni/shared/helpers/test_helpers/mocks/parser.go +++ b/pkg/contract_watcher/shared/helpers/test_helpers/mocks/parser.go @@ -19,8 +19,8 @@ package mocks import ( "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/geth" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Mock parser diff --git a/pkg/omni/shared/parser/parser.go b/pkg/contract_watcher/shared/parser/parser.go similarity index 97% rename from pkg/omni/shared/parser/parser.go rename to pkg/contract_watcher/shared/parser/parser.go index 22686bfb..cc3da5bd 100644 --- a/pkg/omni/shared/parser/parser.go +++ b/pkg/contract_watcher/shared/parser/parser.go @@ -22,9 +22,9 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/geth" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) // Parser is used to fetch and parse contract ABIs diff --git a/pkg/omni/shared/parser/parser_suite_test.go b/pkg/contract_watcher/shared/parser/parser_suite_test.go similarity index 100% rename from pkg/omni/shared/parser/parser_suite_test.go rename to pkg/contract_watcher/shared/parser/parser_suite_test.go diff --git a/pkg/omni/shared/parser/parser_test.go b/pkg/contract_watcher/shared/parser/parser_test.go similarity index 95% rename from pkg/omni/shared/parser/parser_test.go rename to pkg/contract_watcher/shared/parser/parser_test.go index a3ee5bfc..95b065cb 100644 --- a/pkg/omni/shared/parser/parser_test.go +++ b/pkg/contract_watcher/shared/parser/parser_test.go @@ -21,11 +21,11 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/parser" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/geth" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/parser" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) var _ = Describe("Parser", func() { diff --git a/pkg/omni/shared/poller/poller.go b/pkg/contract_watcher/shared/poller/poller.go similarity index 97% rename from pkg/omni/shared/poller/poller.go rename to pkg/contract_watcher/shared/poller/poller.go index 7964e8bf..0a38316c 100644 --- a/pkg/omni/shared/poller/poller.go +++ b/pkg/contract_watcher/shared/poller/poller.go @@ -26,11 +26,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) type Poller interface { diff --git a/pkg/omni/shared/poller/poller_suite_test.go b/pkg/contract_watcher/shared/poller/poller_suite_test.go similarity index 100% rename from pkg/omni/shared/poller/poller_suite_test.go rename to pkg/contract_watcher/shared/poller/poller_suite_test.go diff --git a/pkg/omni/shared/poller/poller_test.go b/pkg/contract_watcher/shared/poller/poller_test.go similarity index 97% rename from pkg/omni/shared/poller/poller_test.go rename to pkg/contract_watcher/shared/poller/poller_test.go index 7b2df18d..c4e06762 100644 --- a/pkg/omni/shared/poller/poller_test.go +++ b/pkg/contract_watcher/shared/poller/poller_test.go @@ -23,13 +23,13 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/poller" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/poller" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) var _ = Describe("Poller", func() { diff --git a/pkg/omni/shared/repository/event_repository.go b/pkg/contract_watcher/shared/repository/event_repository.go similarity index 98% rename from pkg/omni/shared/repository/event_repository.go rename to pkg/contract_watcher/shared/repository/event_repository.go index 4be2a1fe..742ca9ad 100644 --- a/pkg/omni/shared/repository/event_repository.go +++ b/pkg/contract_watcher/shared/repository/event_repository.go @@ -23,9 +23,9 @@ import ( "github.com/hashicorp/golang-lru" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/light/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) const ( diff --git a/pkg/omni/shared/repository/event_repository_test.go b/pkg/contract_watcher/shared/repository/event_repository_test.go similarity index 94% rename from pkg/omni/shared/repository/event_repository_test.go rename to pkg/contract_watcher/shared/repository/event_repository_test.go index aee6fe40..d6c3bff9 100644 --- a/pkg/omni/shared/repository/event_repository_test.go +++ b/pkg/contract_watcher/shared/repository/event_repository_test.go @@ -26,17 +26,17 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + fc "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/converter" + lc "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/converter" + lr "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers/mocks" + sr "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories" - fc "github.com/vulcanize/vulcanizedb/pkg/omni/full/converter" - lc "github.com/vulcanize/vulcanizedb/pkg/omni/light/converter" - lr "github.com/vulcanize/vulcanizedb/pkg/omni/light/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers/mocks" - sr "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) var _ = Describe("Repository", func() { diff --git a/pkg/omni/shared/repository/method_repository.go b/pkg/contract_watcher/shared/repository/method_repository.go similarity index 99% rename from pkg/omni/shared/repository/method_repository.go rename to pkg/contract_watcher/shared/repository/method_repository.go index a55adbf5..4747f141 100644 --- a/pkg/omni/shared/repository/method_repository.go +++ b/pkg/contract_watcher/shared/repository/method_repository.go @@ -23,8 +23,8 @@ import ( "github.com/hashicorp/golang-lru" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) const methodCacheSize = 1000 diff --git a/pkg/omni/shared/repository/method_repository_test.go b/pkg/contract_watcher/shared/repository/method_repository_test.go similarity index 95% rename from pkg/omni/shared/repository/method_repository_test.go rename to pkg/contract_watcher/shared/repository/method_repository_test.go index 54a665c2..b50f1ee5 100644 --- a/pkg/omni/shared/repository/method_repository_test.go +++ b/pkg/contract_watcher/shared/repository/method_repository_test.go @@ -23,12 +23,12 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) var _ = Describe("Repository", func() { diff --git a/pkg/omni/shared/repository/repository_suite_test.go b/pkg/contract_watcher/shared/repository/repository_suite_test.go similarity index 100% rename from pkg/omni/shared/repository/repository_suite_test.go rename to pkg/contract_watcher/shared/repository/repository_suite_test.go diff --git a/pkg/omni/shared/retriever/address_retriever.go b/pkg/contract_watcher/shared/retriever/address_retriever.go similarity index 96% rename from pkg/omni/shared/retriever/address_retriever.go rename to pkg/contract_watcher/shared/retriever/address_retriever.go index 61e2b939..6acdf72b 100644 --- a/pkg/omni/shared/retriever/address_retriever.go +++ b/pkg/contract_watcher/shared/retriever/address_retriever.go @@ -18,14 +18,14 @@ package retriever import ( "fmt" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "strings" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" ) // Address retriever is used to retrieve the addresses associated with a contract diff --git a/pkg/omni/shared/retriever/address_retriever_test.go b/pkg/contract_watcher/shared/retriever/address_retriever_test.go similarity index 87% rename from pkg/omni/shared/retriever/address_retriever_test.go rename to pkg/contract_watcher/shared/retriever/address_retriever_test.go index fd19a8f1..7ff4ced7 100644 --- a/pkg/omni/shared/retriever/address_retriever_test.go +++ b/pkg/contract_watcher/shared/retriever/address_retriever_test.go @@ -21,15 +21,15 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/converter" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/constants" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/helpers/test_helpers" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/repository" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/retriever" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" "github.com/vulcanize/vulcanizedb/pkg/core" "github.com/vulcanize/vulcanizedb/pkg/datastore/postgres" - "github.com/vulcanize/vulcanizedb/pkg/omni/full/converter" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/constants" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/helpers/test_helpers" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/repository" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/retriever" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" ) var mockEvent = core.WatchedEvent{ diff --git a/pkg/omni/shared/retriever/retriever_suite_test.go b/pkg/contract_watcher/shared/retriever/retriever_suite_test.go similarity index 100% rename from pkg/omni/shared/retriever/retriever_suite_test.go rename to pkg/contract_watcher/shared/retriever/retriever_suite_test.go diff --git a/pkg/omni/shared/types/event.go b/pkg/contract_watcher/shared/types/event.go similarity index 100% rename from pkg/omni/shared/types/event.go rename to pkg/contract_watcher/shared/types/event.go diff --git a/pkg/omni/shared/types/method.go b/pkg/contract_watcher/shared/types/method.go similarity index 100% rename from pkg/omni/shared/types/method.go rename to pkg/contract_watcher/shared/types/method.go diff --git a/pkg/omni/shared/types/mode.go b/pkg/contract_watcher/shared/types/mode.go similarity index 100% rename from pkg/omni/shared/types/mode.go rename to pkg/contract_watcher/shared/types/mode.go diff --git a/pkg/fakes/mock_parser.go b/pkg/fakes/mock_parser.go index cac8dd9c..e705f413 100644 --- a/pkg/fakes/mock_parser.go +++ b/pkg/fakes/mock_parser.go @@ -2,7 +2,7 @@ package fakes import ( "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/types" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/types" ) type MockParser struct { diff --git a/pkg/fakes/mock_poller.go b/pkg/fakes/mock_poller.go index f1a1caec..ab7287ee 100644 --- a/pkg/fakes/mock_poller.go +++ b/pkg/fakes/mock_poller.go @@ -1,7 +1,7 @@ package fakes import ( - "github.com/vulcanize/vulcanizedb/pkg/omni/shared/contract" + "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/shared/contract" ) type MockPoller struct {