Skip to content

Commit

Permalink
Bump to v2
Browse files Browse the repository at this point in the history
  • Loading branch information
dantudor committed Oct 18, 2020
1 parent 8f083a5 commit 803b1e2
Show file tree
Hide file tree
Showing 54 changed files with 305 additions and 131 deletions.
4 changes: 2 additions & 2 deletions cmd/address-validator/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/NavExplorer/navexplorer-indexer-go/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/sarulabs/dingo/v3"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/indexer-cli/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/NavExplorer/navexplorer-indexer-go/internal/cli"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/cli"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/NavExplorer/navexplorer-indexer-go/internal/daemon"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/daemon"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/soft-fork/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/NavExplorer/navexplorer-indexer-go/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/sarulabs/dingo/v3"
log "github.com/sirupsen/logrus"
)
Expand Down
20 changes: 8 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
module github.com/NavExplorer/navexplorer-indexer-go
module github.com/NavExplorer/navexplorer-indexer-go/v2

go 1.13
go 1.14

require (
github.com/NavExplorer/navcoind-go v0.1.8-0.20200709223613-3322962ba291
github.com/NavExplorer/subscriber v0.0.0-20200923000930-1321b56838fc
github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect
github.com/dgraph-io/badger/v2 v2.0.3 // indirect
github.com/NavExplorer/navcoind-go v1.1.0
github.com/NavExplorer/subscriber v1.0.0
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect
github.com/getsentry/raven-go v0.2.0
github.com/gosimple/slug v1.9.0
github.com/joho/godotenv v1.3.0
github.com/mr-tron/base58 v1.2.0
github.com/olivere/elastic/v7 v7.0.9
github.com/olivere/elastic/v7 v7.0.21
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/sarulabs/dingo/v3 v3.1.0
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4
github.com/spf13/cobra v1.1.1
github.com/streadway/amqp v1.0.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)
178 changes: 178 additions & 0 deletions go.sum

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions internal/config/di/definitions.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ package di

import (
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/internal/event"
"github.com/NavExplorer/navexplorer-indexer-go/internal/indexer"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/consultation"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/payment_request"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/proposal"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/vote"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/softfork"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/softfork/signal"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/event"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/indexer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/consultation"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/payment_request"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/proposal"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/vote"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/softfork"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/softfork/signal"
"github.com/NavExplorer/subscriber"
"github.com/sarulabs/dingo/v3"
log "github.com/sirupsen/logrus"
Expand Down
8 changes: 4 additions & 4 deletions internal/daemon/daemon.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package daemon

import (
"github.com/NavExplorer/navexplorer-indexer-go/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/internal/indexer"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/v2/generated/dic"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/indexer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/block"
"github.com/getsentry/raven-go"
"github.com/sarulabs/dingo/v3"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion internal/elastic_cache/Indices.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package elastic_cache

import (
"fmt"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
)

type Indices string
Expand Down
4 changes: 2 additions & 2 deletions internal/elastic_cache/elastic_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"errors"
"fmt"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
"github.com/olivere/elastic/v7"
"github.com/patrickmn/go-cache"
Expand Down
16 changes: 8 additions & 8 deletions internal/indexer/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package indexer

import (
"fmt"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/internal/event"
"github.com/NavExplorer/navexplorer-indexer-go/internal/indexer/IndexOption"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/softfork"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/event"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/indexer/IndexOption"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/softfork"
"github.com/getsentry/raven-go"
log "github.com/sirupsen/logrus"
"sync"
Expand Down
10 changes: 5 additions & 5 deletions internal/indexer/rewinder.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package indexer

import (
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/softfork"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/address"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/softfork"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/address/addresses.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package address

import "github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
import "github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"

var Addresses = make(addresses)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/address/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package address

import (
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"time"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/service/address/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package address

import (
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/service/address/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"encoding/json"
"errors"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
"github.com/olivere/elastic/v7"
log "github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions internal/service/address/rewinder.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package address

import (
"context"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/block/block.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package block

import "github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
import "github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"

var LastBlockIndexed *explorer.Block
2 changes: 1 addition & 1 deletion internal/service/block/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package block
import (
"fmt"
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"time"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/service/block/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package block

import (
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/internal/indexer/IndexOption"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/indexer/IndexOption"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
log "github.com/sirupsen/logrus"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/block/orphan.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package block

import (
"errors"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
"time"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/service/block/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package block
import (
"context"
"encoding/json"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
"github.com/olivere/elastic/v7"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/block/rewinder.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package block

import (
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/block/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package block

import (
"errors"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
)

type Service struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/service/dao/consensus/consensus.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package consensus

import (
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"log"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/service/dao/consensus/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package consensus
import (
"context"
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/service/dao/consensus/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package consensus
import (
"context"
"encoding/json"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
"github.com/olivere/elastic/v7"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/service/dao/consensus/rewinder.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package consensus
import (
"context"
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
"strconv"
)
Expand Down
6 changes: 3 additions & 3 deletions internal/service/dao/consensus/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package consensus
import (
"context"
"encoding/json"
"github.com/NavExplorer/navexplorer-indexer-go/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/config"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/service/dao/consultation/consultations.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package consultation

import (
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
)

var Consultations consultations
Expand Down
2 changes: 1 addition & 1 deletion internal/service/dao/consultation/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package consultation

import (
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
log "github.com/sirupsen/logrus"
"reflect"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/service/dao/consultation/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package consultation
import (
"context"
"github.com/NavExplorer/navcoind-go"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/block"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/service/dao/consensus"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
log "github.com/sirupsen/logrus"
"strconv"
Expand Down
4 changes: 2 additions & 2 deletions internal/service/dao/consultation/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package consultation
import (
"context"
"encoding/json"
"github.com/NavExplorer/navexplorer-indexer-go/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/pkg/explorer"
"github.com/NavExplorer/navexplorer-indexer-go/v2/internal/elastic_cache"
"github.com/NavExplorer/navexplorer-indexer-go/v2/pkg/explorer"
"github.com/getsentry/raven-go"
"github.com/olivere/elastic/v7"
log "github.com/sirupsen/logrus"
Expand Down
Loading

0 comments on commit 803b1e2

Please sign in to comment.