Skip to content

Commit

Permalink
Merge pull request irisnet#5 from zhiqiang-bianjie/master
Browse files Browse the repository at this point in the history
IRISHUB-33 基于iris-hub 0.1.0版本修复delegate超过1/3网络崩溃问题
  • Loading branch information
zhangyelong authored May 7, 2018
2 parents a5f822b + 5c4d8ae commit 7877347
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmd/iris/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
noncecmd "github.com/cosmos/cosmos-sdk/modules/nonce/commands"
rolecmd "github.com/cosmos/cosmos-sdk/modules/roles/commands"

stakecmd "github.com/cosmos/gaia/modules/stake/commands"
stakecmd "github.com/MrXJC/gaia/modules/stake/commands"
)

// clientCmd is the entry point for this binary
Expand Down
2 changes: 1 addition & 1 deletion cmd/iris/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/cosmos/cosmos-sdk/stack"
"github.com/cosmos/cosmos-sdk/state"

"github.com/cosmos/gaia/modules/stake"
"github.com/MrXJC/gaia/modules/stake"
)

// nodeCmd is the entry point for this binary
Expand Down
2 changes: 1 addition & 1 deletion cmd/iris/rest.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
noncerest "github.com/cosmos/cosmos-sdk/modules/nonce/rest"
rolerest "github.com/cosmos/cosmos-sdk/modules/roles/rest"

stakerest "github.com/cosmos/gaia/modules/stake/rest"
stakerest "github.com/MrXJC/gaia/modules/stake/rest"
)

const defaultAlgo = "ed25519"
Expand Down
4 changes: 2 additions & 2 deletions glide.lock

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

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: github.com/irisnet/iris-hub
import:
- package: github.com/cosmos/gaia
- package: github.com/MrXJC/gaia
version: develop
- package: github.com/cosmos/cosmos-sdk
version: tm-develop
Expand Down

0 comments on commit 7877347

Please sign in to comment.