Skip to content

Commit

Permalink
Merge pull request evmos#15 from cosmos/bez/lock-depedencies
Browse files Browse the repository at this point in the history
Update Dependency Configuration
  • Loading branch information
alexanderbez authored Jul 9, 2018
2 parents 958e836 + 09d5888 commit 54c477f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 26 deletions.
26 changes: 8 additions & 18 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[[constraint]]
name = "github.com/cosmos/cosmos-sdk"
# TODO: Replace with a stable tagged version
branch = "develop"
# TODO: Replace with a stable tagged version (issue: #3)
revision = "0d6f99d6d514916974a7cc1a7e4577c650e987e1"

[[override]]
name = "google.golang.org/genproto"
revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200"

[[constraint]]
version = "=0.22.0-rc2"
name = "github.com/tendermint/tendermint"
version = "=0.22.0-rc2"

[prune]
go-tests = true
2 changes: 1 addition & 1 deletion core/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
// NOTE: Ethermint will distribute the fees out to validators, so the structure
// and functionality of this is a WIP and subject to change.
type ChainContext struct {
Coinbase ethcommon.Address
Coinbase ethcommon.Address
headersByNumber map[uint64]*ethtypes.Header
}

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"io"
"os"

"github.com/cosmos/ethermint/core"
"github.com/cosmos/ethermint/state"
ethcommon "github.com/ethereum/go-ethereum/common"
ethmisc "github.com/ethereum/go-ethereum/consensus/misc"
ethcore "github.com/ethereum/go-ethereum/core"
Expand All @@ -19,8 +21,6 @@ import (
ethvm "github.com/ethereum/go-ethereum/core/vm"
ethparams "github.com/ethereum/go-ethereum/params"
ethrlp "github.com/ethereum/go-ethereum/rlp"
"github.com/ledgerwatch/ethermint/core"
"github.com/ledgerwatch/ethermint/state"
dbm "github.com/tendermint/tendermint/libs/db"
)

Expand Down Expand Up @@ -195,7 +195,7 @@ func main() {
}

n++
if (n%100) == 0 {
if (n % 100) == 0 {
fmt.Printf("processed %d blocks\n", n)
}
if n >= 1000 {
Expand Down
2 changes: 1 addition & 1 deletion state/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package state
import (
"github.com/cosmos/cosmos-sdk/store"
"github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/ethermint/core"
ethcommon "github.com/ethereum/go-ethereum/common"
ethstate "github.com/ethereum/go-ethereum/core/state"
ethtrie "github.com/ethereum/go-ethereum/trie"
"github.com/ledgerwatch/ethermint/core"
dbm "github.com/tendermint/tendermint/libs/db"
)

Expand Down

0 comments on commit 54c477f

Please sign in to comment.