Skip to content

Commit

Permalink
removed broadcaster prints, added prints to publish handler
Browse files Browse the repository at this point in the history
  • Loading branch information
avendauz committed Aug 2, 2021
1 parent 463af92 commit c968c4b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
29 changes: 15 additions & 14 deletions x/curium/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod
returnError(err)
return
}
fmt.Println("Break 1")


addr, err := getAccountAddress(kr, from)

fmt.Println("Break 2")


if addr == nil {
returnError(errors.New("Nft address is nil"))
Expand All @@ -181,33 +181,33 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod
return
}

fmt.Println("GETTING ACCOUNT")
fmt.Println(addr)


accnt := accKeeper.GetAccount(ctx, addr)
fmt.Println("AFTER GETTING ACCOUNT")



if accnt == nil {
returnError(errors.New("from account does not exist"))
return
}

fmt.Println("Break 3")


fmt.Println("Getting gas price")


gasPrice, err := getGasPriceUbnt()
fmt.Println("After getting gas price")



if err != nil {
returnError(err)
return
}

fmt.Println("Break 4")

fmt.Println("Account", accnt)



// Create a new TxBuilder.
txBuilder := auth.NewTxBuilder(
Expand All @@ -222,7 +222,7 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod
gasPrice,
).WithKeybase(kr)

fmt.Println("Break 5")


signedMsgs, err := txBuilder.BuildAndSign(from, clientkeys.DefaultKeyPass, msgs)

Expand All @@ -242,16 +242,17 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod

broadcastResult, err := core.BroadcastTxSync(&rpcCtx, signedMsgs)

fmt.Println("Break 6")


if err != nil {
fmt.Println("FAILED BROADCAST TX SYNC BY BROADCASTER")
returnError(err)
return
}

result, err := pollForTransaction(rpcCtx, broadcastResult.Hash)

fmt.Println("Break 7")


if err != nil {
returnError(err)
Expand All @@ -262,7 +263,7 @@ func DoBroadcast (resp chan *MsgBroadcasterResponse, keyringDir string, cdc *cod
Response: &result.TxResult,
Data: &result.TxResult.Data,
}
fmt.Println("Break 8")



}
Expand Down
5 changes: 4 additions & 1 deletion x/nft/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,11 @@ func handleMsgPublishFile(ctx sdk.Context, k Keeper, msg *types.MsgPublishFile)
var metainfo metainfo.MetaInfo
bencode.DecodeBytes(msg.Metainfo, &metainfo)
k.BtClient.RetrieveFile(&metainfo)

fmt.Println("FINISHED RETRIEVING FILE")
k.EnsureNftDirExists()
err := os.Symlink(k.HomeDir+"/nft/"+msg.Hash, k.HomeDir+"/nft/"+msg.Vendor + "-" + msg.Id)
if err != nil {
fmt.Println("FAILED SYMLINK")
return nil, err
}
info := types.NftInfo{
Expand All @@ -98,10 +99,12 @@ 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
Expand Down

0 comments on commit c968c4b

Please sign in to comment.