From a20dae20b15156e1c3815046eca7c3ec2f9267df Mon Sep 17 00:00:00 2001 From: jppade Date: Thu, 31 Oct 2024 10:47:09 +0100 Subject: [PATCH] remove comments from merge conflicts. --- cmd/assetCollectionService/go.mod | 2 +- cmd/assetCollectionService/main.go | 3 --- cmd/exchange-scrapers/collector/collector.go | 3 --- cmd/exchange-scrapers/collector/go.mod | 2 +- cmd/liquidityScraper/go.mod | 2 +- 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmd/assetCollectionService/go.mod b/cmd/assetCollectionService/go.mod index 54d701684..7af41c2d8 100644 --- a/cmd/assetCollectionService/go.mod +++ b/cmd/assetCollectionService/go.mod @@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/assetCollectionService go 1.22 require ( - github.com/diadata-org/diadata v1.4.551 + github.com/diadata-org/diadata v1.4.552 github.com/sirupsen/logrus v1.9.3 ) diff --git a/cmd/assetCollectionService/main.go b/cmd/assetCollectionService/main.go index 9d5af4aaa..7835ea46d 100644 --- a/cmd/assetCollectionService/main.go +++ b/cmd/assetCollectionService/main.go @@ -170,7 +170,6 @@ func NewAssetScraper(exchange string, secret string, relDB *models.RelDB) source return source.NewJSONReader(exchange, secret) case dia.AyinExchange: return source.NewAyinAssetSource(exchanges[dia.AyinExchange], relDB) -<<<<<<< HEAD case dia.BitflowExchange: return source.NewBitflowAssetSource(exchanges[dia.BitflowExchange], relDB) case dia.VelarExchange: @@ -179,10 +178,8 @@ func NewAssetScraper(exchange string, secret string, relDB *models.RelDB) source return source.NewVelodromeAssetSource(exchanges[dia.AerodromeSlipstreamExchange], relDB) case dia.AerodromeV1Exchange: return source.NewVelodromeAssetSource(exchanges[dia.AerodromeV1Exchange], relDB) -======= case dia.BifrostExchange: return source.NewBifrostAssetSource(exchanges[dia.BifrostExchange], relDB) ->>>>>>> cd7e3ff50b351adef5c2999645e18ccd225ead0e default: return nil } diff --git a/cmd/exchange-scrapers/collector/collector.go b/cmd/exchange-scrapers/collector/collector.go index a46f5cde6..1f0c903e3 100644 --- a/cmd/exchange-scrapers/collector/collector.go +++ b/cmd/exchange-scrapers/collector/collector.go @@ -42,12 +42,9 @@ var ( dia.ZenlinkswapExchangeBifrostPolkadot, dia.PearlfiExchangeTestnet, dia.PanCakeSwapExchangeV3, -<<<<<<< HEAD dia.BitflowExchange, dia.VelarExchange, -======= dia.BifrostExchange, ->>>>>>> cd7e3ff50b351adef5c2999645e18ccd225ead0e } exchange = flag.String("exchange", "", "which exchange") diff --git a/cmd/exchange-scrapers/collector/go.mod b/cmd/exchange-scrapers/collector/go.mod index 11d49ba6b..f339868cc 100644 --- a/cmd/exchange-scrapers/collector/go.mod +++ b/cmd/exchange-scrapers/collector/go.mod @@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/exchange-scrapers/collector go 1.22 require ( - github.com/diadata-org/diadata v1.4.551 + github.com/diadata-org/diadata v1.4.552 github.com/segmentio/kafka-go v0.4.35 github.com/sirupsen/logrus v1.9.3 ) diff --git a/cmd/liquidityScraper/go.mod b/cmd/liquidityScraper/go.mod index a722ed071..7e52abf85 100644 --- a/cmd/liquidityScraper/go.mod +++ b/cmd/liquidityScraper/go.mod @@ -3,7 +3,7 @@ module github.com/diadata-org/diadata/liquidityScraper go 1.22 require ( - github.com/diadata-org/diadata v1.4.551 + github.com/diadata-org/diadata v1.4.552 github.com/sirupsen/logrus v1.9.3 )