Replace BroadcastTxSync with BroadcastTxCommit

ShareRing · Nov 22, 2019 · 787db5c · 787db5c
1 parent 7466298
commit 787db5c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/client/apis.go b/client/apis.go
@@ -16,20 +16,20 @@ func LoadBalanceAPI(
 	toAddress string, // receiving address
 	amount string, // amount, decimal is possible
 	denom string, // SHR or SHRP
-) (res Response, err error) {
+) (err error) {
 
 	// convert string to sdk.AccAddress
 	addressBytes, err := hex.DecodeString(toAddress)
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	addr := sdk.AccAddress(addressBytes)
 
 	dec, err := types.NewDecFromStr(amount)
 
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	coin := types.NewCoinFromDec(denom, dec)
@@ -45,20 +45,20 @@ func SendCoinAPI(
 	toAddress string, // *address* of the receiver
 	amount string, // amount, decimal is possible Ex: 1.23
 	denom string,
-) (res Response, err error) {
+) (err error) {
 
 	// convert string to sdk.AccAddress
 	addressBytes, err := hex.DecodeString(toAddress)
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	addr := sdk.AccAddress(addressBytes)
 
 	dec, err := types.NewDecFromStr(amount)
 
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	coin := types.NewCoinFromDec(denom, dec)

diff --git a/client/context.go b/client/context.go
@@ -116,6 +116,7 @@ func (c CoreContext) GetNonce() (int64, error) {
 	}
 	return nonce, nil
 }
+
 func (c CoreContext) RegisterValidator(
 	amount int64, // Amount of tokens to be staked
 	moniker string, // name
@@ -158,26 +159,27 @@ func (c CoreContext) RegisterValidator(
 	return err
 }
 
-func (c CoreContext) LoadBalance(to sdk.AccAddress, amount types.Coin) (res Response, err error) {
+func (c CoreContext) LoadBalance(to sdk.AccAddress, amount types.Coin) (err error) {
 
 	msgLoad := bmsg.NewMsgLoad(to, amount)
 
 	authTx, err := c.ConstructTransaction(msgLoad)
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	tdmTx, err := c.ConstructTendermintTransaction(authTx)
 	if err != nil {
-		return res, err
+		return err
 	}
 
-	tdmres, err := c.Client.BroadcastTxSync(tdmTx)
+	r, err := c.Client.BroadcastTxCommit(tdmTx)
 	if err != nil {
-		return res, err
+		return err
 	}
+	err, _ = processTDMResponse(r)
 
-	return convertBroadcastResult(tdmres), nil
+	return err
 
 }
 
@@ -206,26 +208,27 @@ func (c CoreContext) CheckBalance() error {
 	return nil
 }
 
-func (c CoreContext) SendCoins(to sdk.AccAddress, amt types.Coin) (res Response, err error) {
+func (c CoreContext) SendCoins(to sdk.AccAddress, amt types.Coin) (err error) {
 
 	msgSend := bmsg.NewMsgSend(to, amt)
 
 	authTx, err := c.ConstructTransaction(msgSend)
 	if err != nil {
-		return res, err
+		return err
 	}
 
 	tdmTx, err := c.ConstructTendermintTransaction(authTx)
 	if err != nil {
-		return res, err
+		return err
 	}
 
-	tdmres, err := c.Client.BroadcastTxSync(tdmTx)
+	r, err := c.Client.BroadcastTxCommit(tdmTx)
 	if err != nil {
-		return res, err
+		return err
 	}
+	err, _ = processTDMResponse(r)
 
-	return convertBroadcastResult(tdmres), nil
+	return err
 
 }
 

diff --git a/cmd/shareledger/subcommands/load_coins.go b/cmd/shareledger/subcommands/load_coins.go
@@ -64,12 +64,10 @@ func loadCoin(cmd *cobra.Command, args []string) error {
 
 	fmt.Printf("Address=%X Amount=%s\n", addr, dec)
 
-	res, err := context.LoadBalance(addr, amount)
+	err = context.LoadBalance(addr, amount)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf("%v\n", res)
-
 	return nil
 }
diff --git a/cmd/shareledger/subcommands/send_coins.go b/cmd/shareledger/subcommands/send_coins.go
@@ -68,12 +68,10 @@ func sendCoin(cmd *cobra.Command, args []string) error {
 
 	fmt.Printf("Address=%X Amount=%s\n", addr, dec)
 
-	res, err := context.SendCoins(addr, amount)
+	err = context.SendCoins(addr, amount)
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf("%v\n", res)
-
 	return nil
 }