Skip to content

Commit

Permalink
BE-659 | Update import paths (#579)
Browse files Browse the repository at this point in the history
* BE-659 | Update import paths
  • Loading branch information
deividaspetraitis authored Dec 3, 2024
1 parent 3489dee commit 458297d
Show file tree
Hide file tree
Showing 65 changed files with 353 additions and 287 deletions.
2 changes: 1 addition & 1 deletion app/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"

"github.com/osmosis-labs/osmosis/v27/app"
"github.com/osmosis-labs/osmosis/v28/app"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/sidecar_query_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/osmosis-labs/osmosis/v27/app"
txfeestypes "github.com/osmosis-labs/osmosis/v27/x/txfees/types"
"github.com/osmosis-labs/osmosis/v28/app"
txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"
"github.com/osmosis-labs/sqs/domain/cosmos/auth/types"
ingestrpcdelivry "github.com/osmosis-labs/sqs/ingest/delivery/grpc"
ingestusecase "github.com/osmosis-labs/sqs/ingest/usecase"
Expand Down
8 changes: 4 additions & 4 deletions chaininfo/client/chain_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
rpchttp "github.com/cometbft/cometbft/rpc/client/http"
"github.com/cosmos/cosmos-sdk/client"

clpoolmodel "github.com/osmosis-labs/osmosis/v27/x/concentrated-liquidity/model"
cwpoolmodel "github.com/osmosis-labs/osmosis/v27/x/cosmwasmpool/model"
"github.com/osmosis-labs/osmosis/v27/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v27/x/gamm/pool-models/stableswap"
clpoolmodel "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/model"
cwpoolmodel "github.com/osmosis-labs/osmosis/v28/x/cosmwasmpool/model"
"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/balancer"
"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/stableswap"

codectypes "github.com/cosmos/cosmos-sdk/codec/types"
)
Expand Down
2 changes: 1 addition & 1 deletion domain/cosmos/auth/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/cosmos/gogoproto/grpc"
"github.com/osmosis-labs/osmosis/v27/app"
"github.com/osmosis-labs/osmosis/v28/app"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion domain/cosmos/tx/msg_simulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

"github.com/osmosis-labs/osmosis/v27/app/params"
"github.com/osmosis-labs/osmosis/v28/app/params"
"github.com/osmosis-labs/sqs/domain"
"github.com/osmosis-labs/sqs/domain/keyring"
routerrepo "github.com/osmosis-labs/sqs/router/repository"
Expand Down
2 changes: 1 addition & 1 deletion domain/cosmos/tx/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/sqs/domain"

txfeestypes "github.com/osmosis-labs/osmosis/v27/x/txfees/types"
txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"

cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion domain/cosmos/tx/tx_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/osmosis-labs/sqs/domain/mocks"

"github.com/osmosis-labs/osmosis/osmomath"
"github.com/osmosis-labs/osmosis/v27/app"
"github.com/osmosis-labs/osmosis/v28/app"

"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
Expand Down
2 changes: 1 addition & 1 deletion domain/mocks/chain_pool_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/types"
"github.com/osmosis-labs/osmosis/osmomath"
poolmanagertypes "github.com/osmosis-labs/osmosis/v27/x/poolmanager/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
)

type ChainPoolMock struct {
Expand Down
2 changes: 1 addition & 1 deletion domain/mocks/msg_simulator_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/osmosis-labs/osmosis/v27/app/params"
"github.com/osmosis-labs/osmosis/v28/app/params"
"github.com/osmosis-labs/sqs/domain"
sqstx "github.com/osmosis-labs/sqs/domain/cosmos/tx"
"github.com/osmosis-labs/sqs/domain/keyring"
Expand Down
4 changes: 2 additions & 2 deletions domain/mocks/pool_mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/osmosis-labs/sqs/sqsdomain/cosmwasmpool"
sqspassthroughdomain "github.com/osmosis-labs/sqs/sqsdomain/passthroughdomain"

"github.com/osmosis-labs/osmosis/v27/x/gamm/pool-models/balancer"
poolmanagertypes "github.com/osmosis-labs/osmosis/v27/x/poolmanager/types"
"github.com/osmosis-labs/osmosis/v28/x/gamm/pool-models/balancer"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
)

type MockRoutablePool struct {
Expand Down
2 changes: 1 addition & 1 deletion domain/mocks/txfees_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mocks
import (
"context"

txfeestypes "github.com/osmosis-labs/osmosis/v27/x/txfees/types"
txfeestypes "github.com/osmosis-labs/osmosis/v28/x/txfees/types"

"github.com/osmosis-labs/osmosis/osmomath"

Expand Down
4 changes: 2 additions & 2 deletions domain/passthrough/passthrough_grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
distribution "github.com/cosmos/cosmos-sdk/x/distribution/types"
staking "github.com/cosmos/cosmos-sdk/x/staking/types"
math "github.com/osmosis-labs/osmosis/osmomath"
concentratedLiquidity "github.com/osmosis-labs/osmosis/v27/x/concentrated-liquidity/client/queryproto"
lockup "github.com/osmosis-labs/osmosis/v27/x/lockup/types"
concentratedLiquidity "github.com/osmosis-labs/osmosis/v28/x/concentrated-liquidity/client/queryproto"
lockup "github.com/osmosis-labs/osmosis/v28/x/lockup/types"
polarisgrpc "github.com/osmosis-labs/sqs/delivery/grpc"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion domain/routable_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/osmomath"
poolmanagertypes "github.com/osmosis-labs/osmosis/v27/x/poolmanager/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
)

// SQSPoolType is an enum that represents the type of SQS pool.
Expand Down
2 changes: 1 addition & 1 deletion domain/route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/osmosis-labs/sqs/router/usecase/routertesting"

"github.com/osmosis-labs/osmosis/osmomath"
poolmanagertypes "github.com/osmosis-labs/osmosis/v27/x/poolmanager/types"
poolmanagertypes "github.com/osmosis-labs/osmosis/v28/x/poolmanager/types"
)

type RouterTestSuite struct {
Expand Down
77 changes: 44 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
module github.com/osmosis-labs/sqs

go 1.22.4
go 1.22.7

toolchain go1.23.3

require (
cosmossdk.io/math v1.3.0
cosmossdk.io/math v1.4.0
cosmossdk.io/store v1.1.1
cosmossdk.io/x/tx v0.13.5
github.com/CosmWasm/wasmd v0.53.0
github.com/cometbft/cometbft v0.38.13
github.com/cosmos/cosmos-sdk v0.50.10
github.com/labstack/echo/v4 v4.12.0
github.com/osmosis-labs/osmosis/osmomath v0.0.14
github.com/osmosis-labs/osmosis/osmoutils v0.0.14
github.com/osmosis-labs/osmosis/v27 v27.0.0-00010101000000-000000000000
github.com/osmosis-labs/sqs/sqsdomain v0.27.1
github.com/osmosis-labs/osmosis/osmomath v0.0.15
github.com/osmosis-labs/osmosis/osmoutils v0.0.15
github.com/osmosis-labs/osmosis/v28 v28.0.0-20241203131357-2b8ba3645054
github.com/osmosis-labs/sqs/sqsdomain v0.27.2-0.20241203131021-4a1cedb097e8
github.com/prometheus/client_golang v1.20.5
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/swaggo/echo-swagger v1.4.1
github.com/swaggo/swag v1.16.3
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.53.0
go.opentelemetry.io/otel v1.31.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0
go.opentelemetry.io/otel/sdk v1.31.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
go.opentelemetry.io/otel/sdk v1.32.0
go.uber.org/zap v1.26.0
google.golang.org/grpc v1.67.1
google.golang.org/grpc v1.68.0
)

require (
Expand All @@ -41,6 +43,10 @@ require (
github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/bits-and-blooms/bitset v1.8.0 // indirect
github.com/bytedance/sonic v1.12.3 // indirect
github.com/bytedance/sonic/loader v0.2.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 // indirect
github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.0 // indirect
Expand All @@ -51,19 +57,22 @@ require (
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/google/flatbuffers v23.5.26+incompatible // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-metrics v0.5.3 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/shamaton/msgpack/v2 v2.2.0 // indirect
github.com/skip-mev/block-sdk/v2 v2.1.5 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
gotest.tools/v3 v3.5.1 // indirect
)

Expand All @@ -84,7 +93,7 @@ require (
cosmossdk.io/core v0.12.1-0.20240725072823-6a2d039e1212 // indirect
cosmossdk.io/depinject v1.0.0 // indirect
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.4.1 // indirect
cosmossdk.io/log v1.5.0 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.2
Expand All @@ -102,19 +111,19 @@ require (
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.1 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cometbft/cometbft-db v0.12.0 // indirect
github.com/cometbft/cometbft-db v0.14.1 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/gogoproto v1.7.0
github.com/cosmos/iavl v1.2.0 // indirect
github.com/cosmos/ibc-go/v8 v8.5.1 // indirect
github.com/cosmos/ibc-go/v8 v8.5.2 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand Down Expand Up @@ -188,14 +197,14 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/osmosis-labs/osmosis/x/epochs v0.0.10 // indirect
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.16 // indirect
github.com/osmosis-labs/osmosis/x/epochs v0.0.11 // indirect
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.17 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.57.0 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rakyll/statik v0.1.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand All @@ -204,7 +213,7 @@ require (
github.com/rs/zerolog v1.33.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand All @@ -222,26 +231,26 @@ require (
github.com/zondax/ledger-go v0.14.3 // indirect
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/api v0.197.0 // indirect
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/protobuf v1.35.1
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/protobuf v1.35.2
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down Expand Up @@ -273,10 +282,12 @@ replace (
// we explicitly follow main branch tags
github.com/osmosis-labs/osmosis/osmomath => github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240825083448-87db4447a1ff
github.com/osmosis-labs/osmosis/osmoutils => github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240825083448-87db4447a1ff
github.com/osmosis-labs/osmosis/v27 => github.com/osmosis-labs/osmosis/v27 v27.0.0-20241031095800-e8f1b266f784
github.com/osmosis-labs/osmosis/v28 => github.com/osmosis-labs/osmosis/v28 v28.0.0-20241203131357-2b8ba3645054
github.com/osmosis-labs/osmosis/x/epochs => github.com/osmosis-labs/osmosis/x/epochs v0.0.5-0.20240825083448-87db4447a1ff
github.com/osmosis-labs/osmosis/x/ibc-hooks => github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.0-20240825083448-87db4447a1ff

github.com/osmosis-labs/sqs/sqsdomain => ./sqsdomain

// replace as directed by sdk upgrading.md https://github.com/cosmos/cosmos-sdk/blob/393de266c8675dc16cc037c1a15011b1e990975f/UPGRADING.md?plain=1#L713
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
)
Expand Down
Loading

0 comments on commit 458297d

Please sign in to comment.