From 318fa62f8c0ea0e63952bf2c3d8fff61e100774c Mon Sep 17 00:00:00 2001 From: avendauz Date: Mon, 2 Aug 2021 22:30:05 -0400 Subject: [PATCH] removed print statements, basic tests passed --- x/curium/keeper/keeper.go | 23 +++++++++++------------ x/nft/handler.go | 8 ++------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/x/curium/keeper/keeper.go b/x/curium/keeper/keeper.go index ee1abef9..ef0df636 100644 --- a/x/curium/keeper/keeper.go +++ b/x/curium/keeper/keeper.go @@ -141,22 +141,22 @@ func (k Keeper) NewMsgBroadcaster(keyringDir string, cdc *codec.Codec) MsgBroadc func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *codec.Codec, curiumKeeper Keeper, accKeeper *keeper.AccountKeeper, ctx sdk.Context, msgs []sdk.Msg, from string) { returnError := func(err error) { - fmt.Println("ERROR DURING BROADCASTING", err) + resp <- &MsgBroadcasterResponse{ Error: err, } } - //defer func () { - // r:= recover() - // curiumKeeper.Logger(ctx).Error("DoBroadcast", "error", r) - // - // if r != nil { - // returnError(r.(error)) - // } else { - // returnError(errors.New("nil error returned")) - // } - //}() + defer func () { + r:= recover() + curiumKeeper.Logger(ctx).Error("DoBroadcast", "error", r) + + if r != nil { + returnError(r.(error)) + } else { + returnError(errors.New("nil error returned")) + } + }() kr, err := getKeyring(keyringDir) @@ -246,7 +246,6 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod if err != nil { - fmt.Println("FAILED BROADCAST TX SYNC BY BROADCASTER") returnError(err) return } diff --git a/x/nft/handler.go b/x/nft/handler.go index bee5fb8a..6e2baa49 100644 --- a/x/nft/handler.go +++ b/x/nft/handler.go @@ -86,13 +86,11 @@ func handleMsgPublishFile(ctx sdk.Context, k Keeper, msg *types.MsgPublishFile) k.BtClient.RetrieveFile(&metainfo) - fmt.Println("FINISHED RETRIEVING FILE") k.EnsureNftDirExists() - fmt.Println("BEFORE SYMLINKING") + err := os.Symlink(k.HomeDir+"/nft/"+msg.Hash, k.HomeDir+"/nft/"+msg.Vendor + "-" + msg.Id) - fmt.Println("AFTER SYMLINKING") + if err != nil { - fmt.Println("FAILED SYMLINK") return nil, err } info := types.NftInfo{ @@ -103,12 +101,10 @@ func handleMsgPublishFile(ctx sdk.Context, k Keeper, msg *types.MsgPublishFile) } err = os.WriteFile(k.HomeDir+"/nft/"+msg.Hash+".info", k.Cdc.MustMarshalJSON(&info), 0666) if err != nil { - fmt.Println("FAILED METADATA FILE WRITE") return nil, err } err = os.Symlink(k.HomeDir+"/nft/"+msg.Hash+".info", k.HomeDir+"/nft/"+msg.Vendor + "-" + msg.Id+".info") if err != nil { - fmt.Println("FAILED METADATA FILE SYMLINK") return nil, err } return &sdk.Result{}, nil