Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mantlemint v3 #11

Merged
merged 6 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
start v3 bumps
  • Loading branch information
fragwuerdig committed May 2, 2024
commit 4d14894b73f20f1ecee2515298b0f01e4e681f9f
4 changes: 2 additions & 2 deletions block_feed/helpers.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package block_feed

import (
abci "github.com/tendermint/tendermint/abci/types"
tmjson "github.com/tendermint/tendermint/libs/json"
abci "github.com/cometbft/cometbft/abci/types"
tmjson "github.com/cometbft/cometbft/libs/json"
)

func extractBlockFromWSResponse(message []byte) (*BlockResult, error) {
Expand Down
2 changes: 1 addition & 1 deletion block_feed/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package block_feed

import (
tendermint "github.com/tendermint/tendermint/types"
tendermint "github.com/cometbft/cometbft/types"
)

// BlockFeed is a standard interface to provide subscription over blocks
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strings"

terra "github.com/classic-terra/core/v2/app"
terra "github.com/classic-terra/core/v3/app"
"github.com/cosmos/cosmos-sdk/x/crisis"
"github.com/spf13/pflag"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion db/heleveldb/leveldb_batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package heleveldb
import (
"fmt"

dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
"github.com/terra-money/mantlemint/db/hld"
"github.com/terra-money/mantlemint/db/rollbackable"
)
Expand Down
2 changes: 1 addition & 1 deletion db/heleveldb/leveldb_driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"math"

dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
"github.com/terra-money/mantlemint/db/hld"
"github.com/terra-money/mantlemint/lib"
)
Expand Down
2 changes: 1 addition & 1 deletion db/heleveldb/leveldb_iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package heleveldb
import (
"bytes"

dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
"github.com/terra-money/mantlemint/db/hld"
)

Expand Down
2 changes: 1 addition & 1 deletion db/hld/height_limited_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/terra-money/mantlemint/lib"

dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion db/hld/height_limited_iterator.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hld

import dbm "github.com/tendermint/tm-db"
import dbm "github.com/cometbft/cometbft-db"

var _ dbm.Iterator = (*HeightLimitedDBIterator)(nil)

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

import (
dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
)

type HLD interface {
Expand Down
2 changes: 1 addition & 1 deletion db/rollbackable/rollbackable_batch.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package rollbackable

import (
dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
)

type HasRollbackBatch interface {
Expand Down
2 changes: 1 addition & 1 deletion db/safe_batch/safe_batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package safe_batch
import (
"fmt"

dbm "github.com/tendermint/tm-db"
dbm "github.com/cometbft/cometbft-db"
"github.com/terra-money/mantlemint/db/rollbackable"
)

Expand Down
2 changes: 1 addition & 1 deletion db/safe_batch/safe_batch_nullify.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package safe_batch

import dbm "github.com/tendermint/tm-db"
import dbm "github.com/cometbft/cometbft-db"

var _ dbm.Batch = (*SafeBatchNullified)(nil)

Expand Down
2 changes: 1 addition & 1 deletion db/snappy/snappy_batch.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package snappy

import (
dbm "github.com/cometbft/cometbft-db"
"github.com/golang/snappy"
dbm "github.com/tendermint/tm-db"
)

var _ dbm.Batch = (*SnappyBatch)(nil)
Expand Down
2 changes: 1 addition & 1 deletion db/snappy/snappy_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"
"sync"

dbm "github.com/cometbft/cometbft-db"
"github.com/golang/snappy"
"github.com/pkg/errors"
dbm "github.com/tendermint/tm-db"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions db/snappy/snappy_db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"os"
"testing"

dbm "github.com/cometbft/cometbft-db"
tmjson "github.com/cometbft/cometbft/libs/json"
tendermint "github.com/cometbft/cometbft/types"
"github.com/stretchr/testify/assert"
tmjson "github.com/tendermint/tendermint/libs/json"
tendermint "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"
)

func TestSnappyDB(t *testing.T) {
Expand Down
5 changes: 2 additions & 3 deletions db/wrapped/wrapped_db.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ package wrapped

import (
cmdb "github.com/cometbft/cometbft-db"
tmdb "github.com/tendermint/tm-db"
)

// WrappedDB wraps the DB of tm-db and implements the cometbft-db DB interface.
var _ cmdb.DB = (*WrappedDB)(nil)

type WrappedDB struct {
db tmdb.DB
db cmdb.DB
}

func NewWrappedDB(db tmdb.DB) *WrappedDB {
func NewWrappedDB(db cmdb.DB) *WrappedDB {
return &WrappedDB{
db: db,
}
Expand Down
Loading