Skip to content

Commit

Permalink
Merge branch 'sidechannel' of github.com:maticnetwork/heimdall into c…
Browse files Browse the repository at this point in the history
…lerk-sequential-tx
  • Loading branch information
mankenavenkatesh committed May 19, 2020
2 parents 24e74b1 + 81b1e16 commit 49540fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ build: clean
go build -o build/heimdalld ./cmd/heimdalld
go build -o build/heimdallcli ./cmd/heimdallcli
go build -o build/bridge bridge/bridge.go
@echo "====================================================\n==================Build Successful==================\n===================================================="

install:
go install $(BUILD_FLAGS) ./cmd/heimdalld
Expand Down
2 changes: 1 addition & 1 deletion slashing/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func handlerMsgTick(ctx sdk.Context, msg types.MsgTick, k Keeper, contractCaller
totalSlashedAmount := k.GetTotalSlashedAmount(ctx)
if totalSlashedAmount == 0 {
k.Logger(ctx).Error("Slashed amount is zero")
return hmCommon.ErrInvalidMsg(k.Codespace(), "Slashed amount is zero", totalSlashedAmount).Result()
return hmCommon.ErrInvalidMsg(k.Codespace(), "Slashed amount is zero").Result()
}

// check if tick msgs are in continuity
Expand Down

0 comments on commit 49540fa

Please sign in to comment.