Skip to content

Commit

Permalink
added hash to MsgBroadcasterResponse, added checks for broadcast erro…
Browse files Browse the repository at this point in the history
…rs in oracle feeder
  • Loading branch information
Aven Dauz authored and Aven Dauz committed Aug 15, 2021
1 parent 6add767 commit 83d6fad
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
3 changes: 3 additions & 0 deletions x/curium/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type MsgBroadcaster func(ctx sdk.Context, msgs []sdk.Msg, from string) chan *Msg
type MsgBroadcasterResponse struct {
Response *abci.ResponseDeliverTx
Data *[]byte
Hash *string
Error error
}

Expand Down Expand Up @@ -298,10 +299,12 @@ func DoBroadcast(resp chan *MsgBroadcasterResponse, keyringDir string, cdc *code
returnError(err)
return
}
hash := result.Hash.String()

resp <- &MsgBroadcasterResponse{
Response: &result.TxResult,
Data: &result.TxResult.Data,
Hash: &hash,
}

}
Expand Down
17 changes: 12 additions & 5 deletions x/oracle/feeder.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,12 @@ func sendPreflightMsgs(ctx sdk.Context, values []SourceAndValue, keeper Keeper)
}
logger.Info("Sending oracle proof messages", "count", len(msgs))
result := <- keeper.MsgBroadcaster(ctx, msgs, "oracle")

logger.Info("Oracle proof messages sent", "response", result.Response.Log)
return result.Response.Log
if result.Error != nil {
logger.Error("Error sending oracle proof messages", "error", result.Error)
return ""
}
logger.Info("Oracle proof messages sent", "response", result.Hash)
return *result.Hash
}

func sendVoteMsgs(ctx sdk.Context, values []SourceAndValue, keeper Keeper) string {
Expand All @@ -151,8 +154,12 @@ func sendVoteMsgs(ctx sdk.Context, values []SourceAndValue, keeper Keeper) strin
}
logger.Info("Sending feeder vote messages", "count", len(msgs))
result := <- keeper.MsgBroadcaster(ctx, msgs, "oracle")
logger.Info("Feeder vote messages sent", "hash", result.Response.Log)
return result.Response.Log
if result.Error != nil {
logger.Error("Error sending feeder vote message", "error", result.Error)
return ""
}
logger.Info("Feeder vote messages sent", "hash", result.Hash)
return *result.Hash
}

func generateVoteMsg(source SourceAndValue, keyringReader *curium.KeyringReader) (types.MsgOracleVote, error) {
Expand Down

0 comments on commit 83d6fad

Please sign in to comment.