Skip to content

Commit

Permalink
Merge pull request #18 from forbole/dev/update-paths
Browse files Browse the repository at this point in the history
feat: updated njuno paths
  • Loading branch information
MonikaCat authored Aug 30, 2022
2 parents ef92a81 + bdb9ea7 commit d12e376
Show file tree
Hide file tree
Showing 79 changed files with 202 additions and 419 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FROM golang:alpine AS build-env
ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev py-pip

# Set working directory for the build
WORKDIR /go/src/github.com/MonikaCat/njuno
WORKDIR /go/src/github.com/forbole/njuno

# Add source files
COPY . .
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ all: lint test-unit install
### Build flags ###
###############################################################################

LD_FLAGS = -X github.com/MonikaCat/njuno/cmd.Version=$(VERSION) \
-X github.com/MonikaCat/njuno/cmd.Commit=$(COMMIT)
LD_FLAGS = -X github.com/forbole/njuno/cmd.Version=$(VERSION) \
-X github.com/forbole/njuno/cmd.Commit=$(COMMIT)

BUILD_FLAGS := -ldflags '$(LD_FLAGS)'

Expand Down Expand Up @@ -76,7 +76,7 @@ lint-fix:
format:
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs gofmt -w -s
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs misspell -w
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/MonikaCat/njuno
find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' | xargs goimports -w -local github.com/forbole/njuno
.PHONY: format

clean:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

> This branch is intended to be used with Cosmos SDK `v0.42.x`.
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/MonikaCat/njuno/Tests)](https://github.com/MonikaCat/njuno/actions?query=workflow%3ATests)
[![Go Report Card](https://goreportcard.com/badge/github.com/MonikaCat/njuno)](https://goreportcard.com/report/github.com/MonikaCat/njuno)
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/forbole/njuno/Tests)](https://github.com/forbole/njuno/actions?query=workflow%3ATests)
[![Go Report Card](https://goreportcard.com/badge/github.com/forbole/njuno)](https://goreportcard.com/report/github.com/forbole/njuno)

> nJuno is a Nomic blockchain data aggregator and exporter that provides the ability for developers and clients to query for indexed chain data.
Expand Down
4 changes: 2 additions & 2 deletions cmd/config.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package cmd

import (
initcmd "github.com/MonikaCat/njuno/cmd/init"
parsecmd "github.com/MonikaCat/njuno/cmd/parse/types"
initcmd "github.com/forbole/njuno/cmd/init"
parsecmd "github.com/forbole/njuno/cmd/parse/types"
)

// Config represents the general configuration for the commands
Expand Down
10 changes: 5 additions & 5 deletions cmd/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"os"
"path"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"

initcmd "github.com/MonikaCat/njuno/cmd/init"
parsecmd "github.com/MonikaCat/njuno/cmd/parse"
startcmd "github.com/MonikaCat/njuno/cmd/start"
initcmd "github.com/forbole/njuno/cmd/init"
parsecmd "github.com/forbole/njuno/cmd/parse"
startcmd "github.com/forbole/njuno/cmd/start"

"github.com/MonikaCat/njuno/types"
"github.com/forbole/njuno/types"

"github.com/spf13/cobra"
"github.com/tendermint/tendermint/libs/cli"
Expand Down
2 changes: 1 addition & 1 deletion cmd/init/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/init/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package init
import (
"github.com/spf13/cobra"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"
)

// WritableConfig represents a configuration that can be written to a file
Expand Down
8 changes: 4 additions & 4 deletions cmd/njuno/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package main
import (
"os"

"github.com/MonikaCat/njuno/cmd/parse/types"
"github.com/forbole/njuno/cmd/parse/types"

"github.com/MonikaCat/njuno/modules/messages"
"github.com/MonikaCat/njuno/modules/registrar"
"github.com/forbole/njuno/modules/messages"
"github.com/forbole/njuno/modules/registrar"

"github.com/MonikaCat/njuno/cmd"
"github.com/forbole/njuno/cmd"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/blocks/blocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package blocks
import (
"fmt"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"

"github.com/rs/zerolog/log"

"github.com/spf13/cobra"

"github.com/MonikaCat/njuno/parser"
"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/parser"
"github.com/forbole/njuno/types/config"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/blocks/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package blocks
import (
"github.com/spf13/cobra"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"
)

// NewBlocksCmd returns the Cobra command that allows to fix all the things related to blocks
Expand Down
10 changes: 5 additions & 5 deletions cmd/parse/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package parse
import (
"github.com/spf13/cobra"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"

parseblocks "github.com/MonikaCat/njuno/cmd/parse/blocks"
parsegenesis "github.com/MonikaCat/njuno/cmd/parse/genesis"
parsestaking "github.com/MonikaCat/njuno/cmd/parse/staking"
parsetransactions "github.com/MonikaCat/njuno/cmd/parse/transactions"
parseblocks "github.com/forbole/njuno/cmd/parse/blocks"
parsegenesis "github.com/forbole/njuno/cmd/parse/genesis"
parsestaking "github.com/forbole/njuno/cmd/parse/staking"
parsetransactions "github.com/forbole/njuno/cmd/parse/transactions"
)

// NewParseCmd returns the Cobra command allowing to parse chain data without having to re-sync the whole database
Expand Down
8 changes: 4 additions & 4 deletions cmd/parse/genesis/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package genesis
import (
"github.com/spf13/cobra"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"

"github.com/MonikaCat/njuno/modules"
nodeconfig "github.com/MonikaCat/njuno/node/config"
"github.com/MonikaCat/njuno/types/utils"
"github.com/forbole/njuno/modules"
nodeconfig "github.com/forbole/njuno/node/config"
"github.com/forbole/njuno/types/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/staking/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package staking

import (
parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/staking/validators.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package staking

import (
parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
staking "github.com/MonikaCat/njuno/modules/staking/utils"
"github.com/MonikaCat/njuno/types/config"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"
staking "github.com/forbole/njuno/modules/staking/utils"
"github.com/forbole/njuno/types/config"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/transactions/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package transactions
import (
"github.com/spf13/cobra"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"
)

// NewTransactionsCmd returns the Cobra command that allows to fix missing or incomplete transactions
Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/transactions/transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package transactions
import (
"fmt"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"

"github.com/rs/zerolog/log"

"github.com/spf13/cobra"

"github.com/MonikaCat/njuno/parser"
"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/parser"
"github.com/forbole/njuno/types/config"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/parse/types/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"os"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"

"github.com/spf13/cobra"

"github.com/MonikaCat/njuno/types"
"github.com/forbole/njuno/types"
)

// ReadConfigPreRunE represents a Cobra cmd function allowing to read the config before executing the command itself
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/types/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/simapp/params"
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"
)

// SdkConfigSetup represents a method that allows to customize the given sdk.Config.
Expand Down
10 changes: 5 additions & 5 deletions cmd/parse/types/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import (
"fmt"
"reflect"

"github.com/MonikaCat/njuno/parser"
"github.com/forbole/njuno/parser"

nodebuilder "github.com/MonikaCat/njuno/node/builder"
"github.com/MonikaCat/njuno/types/config"
nodebuilder "github.com/forbole/njuno/node/builder"
"github.com/forbole/njuno/types/config"

"github.com/MonikaCat/njuno/database"
"github.com/forbole/njuno/database"

sdk "github.com/cosmos/cosmos-sdk/types"

modsregistrar "github.com/MonikaCat/njuno/modules/registrar"
modsregistrar "github.com/forbole/njuno/modules/registrar"
)

// GetParserContext setups all the things that can be used to later parse the chain state
Expand Down
10 changes: 5 additions & 5 deletions cmd/parse/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package types
import (
"github.com/cosmos/cosmos-sdk/simapp"

"github.com/MonikaCat/njuno/logging"
"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/logging"
"github.com/forbole/njuno/types/config"

"github.com/MonikaCat/njuno/database"
"github.com/MonikaCat/njuno/database/builder"
"github.com/MonikaCat/njuno/modules/registrar"
"github.com/forbole/njuno/database"
"github.com/forbole/njuno/database/builder"
"github.com/forbole/njuno/modules/registrar"
)

// Config contains all the configuration for the "parse" command
Expand Down
12 changes: 6 additions & 6 deletions cmd/start/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import (
"syscall"
"time"

parsecmdtypes "github.com/MonikaCat/njuno/cmd/parse/types"
parsecmdtypes "github.com/forbole/njuno/cmd/parse/types"

"github.com/MonikaCat/njuno/logging"
"github.com/forbole/njuno/logging"

"github.com/MonikaCat/njuno/types/config"
"github.com/forbole/njuno/types/config"

"github.com/go-co-op/gocron"

"github.com/MonikaCat/njuno/modules"
"github.com/MonikaCat/njuno/parser"
"github.com/MonikaCat/njuno/types"
"github.com/forbole/njuno/modules"
"github.com/forbole/njuno/parser"
"github.com/forbole/njuno/types"

"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions database/builder/builder.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package builder

import (
"github.com/MonikaCat/njuno/database"
"github.com/forbole/njuno/database"

"github.com/MonikaCat/njuno/database/postgresql"
"github.com/forbole/njuno/database/postgresql"
)

// Builder represents a generic Builder implementation that build the proper database
Expand Down
8 changes: 4 additions & 4 deletions database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (

"github.com/cosmos/cosmos-sdk/simapp/params"

"github.com/MonikaCat/njuno/logging"
"github.com/forbole/njuno/logging"

databaseconfig "github.com/MonikaCat/njuno/database/config"
databaseconfig "github.com/forbole/njuno/database/config"

dbtypes "github.com/MonikaCat/njuno/database/types"
"github.com/MonikaCat/njuno/types"
sdk "github.com/cosmos/cosmos-sdk/types"
dbtypes "github.com/forbole/njuno/database/types"
"github.com/forbole/njuno/types"
)

// Database represents an abstract database that can be used to save data inside it
Expand Down
2 changes: 1 addition & 1 deletion database/postgresql/bank.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package postgresql
import (
"fmt"

dbtypes "github.com/MonikaCat/njuno/database/types"
sdk "github.com/cosmos/cosmos-sdk/types"
dbtypes "github.com/forbole/njuno/database/types"
"github.com/lib/pq"
)

Expand Down
4 changes: 2 additions & 2 deletions database/postgresql/consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

dbtypes "github.com/MonikaCat/njuno/database/types"
"github.com/MonikaCat/njuno/types"
dbtypes "github.com/forbole/njuno/database/types"
"github.com/forbole/njuno/types"
)

// GetBlockHeightTimeMinuteAgo return block height and time that a block proposals
Expand Down
2 changes: 1 addition & 1 deletion database/postgresql/ibc.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"

"github.com/MonikaCat/njuno/types"
"github.com/forbole/njuno/types"
)

// SaveIBCTransferParams allows to store the given ibc transfer params inside the database
Expand Down
4 changes: 2 additions & 2 deletions database/postgresql/postgresql.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"database/sql"
"fmt"

"github.com/MonikaCat/njuno/logging"
"github.com/forbole/njuno/logging"
"github.com/jmoiron/sqlx"

"github.com/cosmos/cosmos-sdk/simapp/params"

"github.com/MonikaCat/njuno/database"
"github.com/forbole/njuno/database"
)

// Builder creates a database connection with the given database connection info
Expand Down
8 changes: 4 additions & 4 deletions database/postgresql/postgresql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/stretchr/testify/suite"

"github.com/MonikaCat/njuno/database"
databaseconfig "github.com/MonikaCat/njuno/database/config"
postgres "github.com/MonikaCat/njuno/database/postgresql"
"github.com/MonikaCat/njuno/logging"
"github.com/forbole/njuno/database"
databaseconfig "github.com/forbole/njuno/database/config"
postgres "github.com/forbole/njuno/database/postgresql"
"github.com/forbole/njuno/logging"
)

func TestDatabaseTestSuite(t *testing.T) {
Expand Down
Loading

0 comments on commit d12e376

Please sign in to comment.