resolve conflicts

ojo-network · Nov 13, 2023 · 309be7f · 309be7f
1 parent 6e05566
commit 309be7f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 50 deletions.
diff --git a/ojo-provider-config/endpoints.toml b/ojo-provider-config/endpoints.toml
diff --git a/oracle/provider/uniswap_test.go b/oracle/provider/uniswap_test.go
@@ -5,14 +5,7 @@ import (
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-<<<<<<< HEAD
-	"github.com/hasura/go-graphql-client"
-	"github.com/rs/zerolog"
-	"github.com/stretchr/testify/suite"
-	"github.com/cometbft/cometbft/libs/rand"
 
-=======
->>>>>>> 9ca4545 (feat: Update uniswap provider to use new websocket api (#308))
 	"github.com/ojo-network/price-feeder/oracle/types"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"

diff --git a/umee-provider-config/currency-pairs.toml b/umee-provider-config/currency-pairs.toml
@@ -160,7 +160,6 @@ base = "stATOM"
 providers = [
   "osmosis",
 ]
-<<<<<<< HEAD:umee-provider-config/currency-pairs.toml
 quote = "ATOM"
 
 [[currency_pairs]]
@@ -324,9 +323,6 @@ providers = [
   "osmosis",
 ]
 quote = "UMEE"
-=======
-quote = "WETH"
->>>>>>> 9ca4545 (feat: Update uniswap provider to use new websocket api (#308)):ojo-provider-config/currency-pairs.toml
 
 [[currency_pairs]]
 base = "RETH"
@@ -335,20 +331,6 @@ providers = [
 ]
 quote = "WETH"
 
-[[currency_pairs]]
-base = "SFRXETH"
-providers = [
-  "eth-uniswap",
-]
-quote = "WETH"
-
-[[currency_pairs]]
-base = "WSTETH"
-providers = [
-  "eth-uniswap",
-]
-quote = "WETH"
-
 [[currency_pairs]]
 base = "NCT"
 providers = [
@@ -357,7 +339,6 @@ providers = [
 quote = "OSMO"
 
 [[currency_pairs]]
-<<<<<<< HEAD:umee-provider-config/currency-pairs.toml
 base = "SOMM"
 providers = [
   "osmosis",
@@ -366,9 +347,6 @@ quote = "OSMO"
 
 [[currency_pairs]]
 base = "SOMM"
-=======
-base = "DAI"
->>>>>>> 9ca4545 (feat: Update uniswap provider to use new websocket api (#308)):ojo-provider-config/currency-pairs.toml
 providers = [
   "gate",
 ]
@@ -396,5 +374,4 @@ providers = [
   "bitget",
   "mexc",
 ]
-quote = "USDT"
-
+quote = "USDT"
diff --git a/umee-provider-config/endpoints.toml b/umee-provider-config/endpoints.toml
@@ -1,19 +1,4 @@
-[[provider_endpoints]]
-name = "osmosis"
-rest = "https://api.osmo-api.prod.ojo.network"
-websocket = "api.osmo-api.prod.ojo.network"
-
-[[provider_endpoints]]
-name = "crescent"
-rest = "https://api.cresc-api.prod.ojo.network"
-websocket = "api.cresc-api.prod.ojo.network"
-
 [[provider_endpoints]]
 name = "binance"
 rest = "https://api1.binance.com"
 websocket = "stream.binance.com:9443"
-
-[[provider_endpoints]]
-name = "eth-uniswap"
-rest = "http://104.197.233.185:8000/subgraphs/name/ojo-network/unidexer"
-websocket = "not supported"