Skip to content

Commit

Permalink
imp: V1 and V2 directories refactor (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
@facs95
facs95 authored Jun 29, 2023
1 parent 9ed570a commit c75c431
Show file tree
Hide file tree
Showing 77 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion internal/config/config.go → api/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func LoadConfig() (*Config, error) {
}

// Build the absolute path to the target file
filePath := filepath.Join(dir, "internal/config/config.toml")
filePath := filepath.Join(dir, "api/config/config.toml")

cfg := &Config{}
if _, err = toml.DecodeFile(filePath, cfg); err != nil {
Expand Down
0 internal/config/config.toml → api/config/config.toml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/handler/handler.go → api/handler/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package handler

import (
"github.com/tharsis/dashboard-backend/internal/handler/v2"
"github.com/tharsis/dashboard-backend/api/handler/v2"
)

type Handler struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/handler/router.go → api/handler/router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package handler

import (
"github.com/fasthttp/router"
v1 "github.com/tharsis/dashboard-backend/internal/handler/v1"
v1 "github.com/tharsis/dashboard-backend/api/handler/v1"
)

func (h *Handler) RegisterRoutes(r *router.Router) {
Expand Down
0 internal/handler/status.go → api/handler/status.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/handler/v1/airtable.go → api/handler/v1/airtable.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package v1

import (
"github.com/fasthttp/router"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/valyala/fasthttp"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/handler/v1/balances.go → api/handler/v1/balances.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1

import (
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
"github.com/valyala/fasthttp"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/handler/v1/custom.go → api/handler/v1/custom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

sdkmath "cosmossdk.io/math"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/valyala/fasthttp"
)

Expand Down
12 changes: 6 additions & 6 deletions internal/handler/v1/erc20.go → api/handler/v1/erc20.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"strings"

decimal "github.com/cosmos/cosmos-sdk/types"
"github.com/tharsis/dashboard-backend/internal/blockchain"
"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/utils"
"github.com/tharsis/dashboard-backend/internal/v1/blockchain"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
"github.com/tharsis/dashboard-backend/internal/v1/utils"
"github.com/valyala/fasthttp"
"golang.org/x/exp/slices"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/handler/v1/governance.go → api/handler/v1/governance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v1
import (
"encoding/json"

"github.com/tharsis/dashboard-backend/internal/blockchain"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/v1/blockchain"
"github.com/tharsis/dashboard-backend/internal/v1/db"

"github.com/valyala/fasthttp"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/handler/v1/helpers.go → api/handler/v1/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"fmt"
"strings"

"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/metrics"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/metrics"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/valyala/fasthttp"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/handler/v1/helpersTransaction.go → api/handler/v1/helpersTransaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
)

type PubKeyAccount struct {
Expand Down
6 changes: 3 additions & 3 deletions internal/handler/v1/network.go → api/handler/v1/network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"
"strings"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
"github.com/valyala/fasthttp"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/handler/v1/proxy.go → api/handler/v1/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strconv"
"strings"

"github.com/tharsis/dashboard-backend/internal/blockchain"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/blockchain"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/valyala/fasthttp"
)

Expand Down
0 internal/handler/v1/router.go → api/handler/v1/router.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/handler/v1/staking.go → api/handler/v1/staking.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

"github.com/tharsis/dashboard-backend/internal/blockchain"
"github.com/tharsis/dashboard-backend/internal/v1/blockchain"
"github.com/valyala/fasthttp"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/handler/v1/transaction.go → api/handler/v1/transaction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/gogo/protobuf/proto"

tx3 "github.com/cosmos/cosmos-sdk/x/auth/tx"
"github.com/tharsis/dashboard-backend/internal/blockchain"
"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/v1/blockchain"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
"github.com/valyala/fasthttp"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/handler/v1/utils.go → api/handler/v1/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strconv"
"strings"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
"github.com/valyala/fasthttp"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/handler/v1/validators.go → api/handler/v1/validators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sort"

sdkmath "cosmossdk.io/math"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/valyala/fasthttp"
)

Expand Down
0 internal/handler/v2/delegations.go → api/handler/v2/delegations.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/handler/v2/handler.go → api/handler/v2/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package v2

import "github.com/tharsis/dashboard-backend/internal/numia"
import "github.com/tharsis/dashboard-backend/internal/v2/numia"

type Handler struct {
numiaRPCClient *numia.RPCClient // client to make RPC queries to Numia
Expand Down
0 internal/handler/v2/height.go → api/handler/v2/height.go
View file
File renamed without changes.
0 internal/handler/v2/responses.go → api/handler/v2/responses.go
View file
File renamed without changes.
0 internal/handler/v2/rewards.go → api/handler/v2/rewards.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/handler/v2/tx.go → api/handler/v2/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v2
import (
"encoding/json"

"github.com/tharsis/dashboard-backend/internal/node/rest"
"github.com/tharsis/dashboard-backend/internal/v2/node/rest"

"github.com/cosmos/cosmos-sdk/types/tx"
"github.com/valyala/fasthttp"
Expand Down
0 internal/handler/v2/vesting.go → api/handler/v2/vesting.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions internal/rpc/server.go → api/server.go
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Copyright Tharsis Labs Ltd.(Evmos)
// SPDX-License-Identifier:ENCL-1.0(https://github.com/evmos/backend/blob/main/LICENSE)

package rpc
package api

import (
"fmt"
"log"
"os"

"github.com/tharsis/dashboard-backend/api/config"
"github.com/tharsis/dashboard-backend/api/handler"

"github.com/fasthttp/router"
"github.com/tharsis/dashboard-backend/internal/config"
"github.com/tharsis/dashboard-backend/internal/handler"
"github.com/valyala/fasthttp"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"os/signal"
"syscall"

"github.com/tharsis/dashboard-backend/internal/config"
"github.com/tharsis/dashboard-backend/internal/rpc"
"github.com/tharsis/dashboard-backend/api"
"github.com/tharsis/dashboard-backend/api/config"

"github.com/tharsis/dashboard-backend/internal/metrics"
"github.com/tharsis/dashboard-backend/internal/v1/metrics"
)

func main() {
Expand All @@ -31,7 +31,7 @@ func main() {
log.Fatalf("Failed to load configuration: %v", err)
}

rpcserver := rpc.NewServer(cfg)
rpcserver := api.NewServer(cfg)
if err = rpcserver.Start(); err != nil {
log.Printf("Error starting RPC server: %v\n", err)
}
Expand Down
4 changes: 2 additions & 2 deletions go-crons/endpoints/cron.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/tharsis/dashboard-backend/go-crons/endpoints/helpers"
"github.com/tharsis/dashboard-backend/go-crons/endpoints/models"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go-crons/endpoints/helpers/jrpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/tharsis/dashboard-backend/go-crons/endpoints/constants"
"github.com/tharsis/dashboard-backend/go-crons/endpoints/models"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

var jwg sync.WaitGroup
Expand Down
2 changes: 1 addition & 1 deletion go-crons/endpoints/helpers/rest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/tharsis/dashboard-backend/go-crons/endpoints/models"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

var rwg sync.WaitGroup
Expand Down
2 changes: 1 addition & 1 deletion go-crons/endpoints/helpers/web3.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/tharsis/dashboard-backend/go-crons/endpoints/models"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

var wwg sync.WaitGroup
Expand Down
6 changes: 3 additions & 3 deletions go-crons/price/price.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"fmt"
"time"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/resources"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
"github.com/tharsis/dashboard-backend/internal/v1/resources"
)

var running = true
Expand Down
0 internal/blockchain/builder.go → internal/v1/blockchain/builder.go
View file
File renamed without changes.
0 internal/blockchain/builder_test.go → internal/v1/blockchain/builder_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/blockchain/erc20.go → internal/v1/blockchain/erc20.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/evmos/evmos/v12/x/erc20/types"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

func GetERC20Balance(contract string, wallet string) (string, error) {
Expand Down
0 internal/blockchain/erc20_test.go → internal/v1/blockchain/erc20_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/blockchain/governance.go → internal/v1/blockchain/governance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

type V1GovernanceProposalsResponse struct {
Expand Down
0 internal/blockchain/governance_test.go → internal/v1/blockchain/governance_test.go
View file
File renamed without changes.
0 internal/blockchain/helpers.go → internal/v1/blockchain/helpers.go
View file
File renamed without changes.
0 internal/blockchain/ibctransfer.go → internal/v1/blockchain/ibctransfer.go
View file
File renamed without changes.
0 internal/blockchain/staking.go → internal/v1/blockchain/staking.go
View file
File renamed without changes.
0 internal/blockchain/transactionbuilder.go → internal/v1/blockchain/transactionbuilder.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nal/blockchain/transactionbuilder_test.go → .../v1/blockchain/transactionbuilder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/gogo/protobuf/proto"
"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
)

func TestCreateTransactionWithMessage(t *testing.T) {
Expand Down
0 internal/blockchain/transactions.go → internal/v1/blockchain/transactions.go
View file
File renamed without changes.
0 internal/blockchain/types.go → internal/v1/blockchain/types.go
View file
File renamed without changes.
0 internal/constants/erc20.go → internal/v1/constants/erc20.go
View file
File renamed without changes.
0 internal/constants/ibc.go → internal/v1/constants/ibc.go
View file
File renamed without changes.
0 internal/constants/networks.go → internal/v1/constants/networks.go
View file
File renamed without changes.
0 internal/db/airtable.go → internal/v1/db/airtable.go
View file
File renamed without changes.
0 internal/db/constants.go → internal/v1/db/constants.go
View file
File renamed without changes.
0 internal/db/custom.go → internal/v1/db/custom.go
View file
File renamed without changes.
0 internal/db/endpoint.go → internal/v1/db/endpoint.go
View file
File renamed without changes.
0 internal/db/erc20.go → internal/v1/db/erc20.go
View file
File renamed without changes.
0 internal/db/github.go → internal/v1/db/github.go
View file
File renamed without changes.
0 internal/db/governance.go → internal/v1/db/governance.go
View file
File renamed without changes.
0 internal/db/network.go → internal/v1/db/network.go
View file
File renamed without changes.
0 internal/db/price.go → internal/v1/db/price.go
View file
File renamed without changes.
0 internal/db/proxy.go → internal/v1/db/proxy.go
View file
File renamed without changes.
0 internal/db/utils.go → internal/v1/db/utils.go
View file
File renamed without changes.
0 internal/db/validatordirectory.go → internal/v1/db/validatordirectory.go
View file
File renamed without changes.
0 internal/metrics/sentry.go → internal/v1/metrics/sentry.go
View file
File renamed without changes.
0 internal/requester/airtable.go → internal/v1/requester/airtable.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/requester/github.go → internal/v1/requester/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"
"strings"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/v1/db"
)

type Tree struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/requester/requester.go → internal/v1/requester/requester.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"time"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/metrics"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/metrics"
)

var Client = http.Client{
Expand Down
6 changes: 3 additions & 3 deletions internal/resources/helpers.go → internal/v1/resources/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package resources
import (
"encoding/json"

"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/requester"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
"github.com/tharsis/dashboard-backend/internal/v1/db"
"github.com/tharsis/dashboard-backend/internal/v1/requester"
)

func GetERC20Tokens() ([]CoinConfig, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/ibc.go → internal/v1/resources/ibc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package resources
import (
"strings"

"github.com/tharsis/dashboard-backend/internal/constants"
"github.com/tharsis/dashboard-backend/internal/v1/constants"
)

func GetIBCChannels() (map[string]map[string]string, error) {
Expand Down
0 internal/resources/models.go → internal/v1/resources/models.go
View file
File renamed without changes.
0 internal/resources/networks.go → internal/v1/resources/networks.go
View file
File renamed without changes.
0 internal/resources/tokens.go → internal/v1/resources/tokens.go
View file
File renamed without changes.
0 internal/utils/converter.go → internal/v1/utils/converter.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/utils/converter_test.go → internal/v1/utils/converter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

decimal "github.com/cosmos/cosmos-sdk/types"
"github.com/tharsis/dashboard-backend/internal/utils"
"github.com/tharsis/dashboard-backend/internal/v1/utils"
)

func TestNumberToBiggerDenom(t *testing.T) {
Expand Down
0 internal/encoding/config.go → internal/v2/encoding/config.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/node/rest/client.go → internal/v2/node/rest/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"time"

"github.com/tharsis/dashboard-backend/internal/db"
"github.com/tharsis/dashboard-backend/internal/v1/db"
)

type Client struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/node/rest/tx.go → internal/v2/node/rest/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package rest
import (
"fmt"

"github.com/tharsis/dashboard-backend/internal/encoding"
"github.com/tharsis/dashboard-backend/internal/v2/encoding"

"github.com/cosmos/cosmos-sdk/types/tx"
)
Expand Down
0 internal/numia/client.go → internal/v2/numia/client.go
View file
File renamed without changes.
0 internal/numia/queries.go → internal/v2/numia/queries.go
View file
File renamed without changes.

0 comments on commit c75c431

Please sign in to comment.