refactor: aeternity.WaitSynchronous()

aeternity/context.go

@@ -77,16 +77,15 @@ func (c *Context) NodeInfo() (networkID string, version string) {
 }
 
 // SignBroadcastWait signs, sends and waits for the transaction to be mined.
-func (c *Context) SignBroadcastWait(tx transactions.Transaction, blocks uint64) (txReceipt *TxReceipt, err error) {
+func (c *Context) SignBroadcastWait(tx transactions.Transaction, blocks uint64) (mined bool, txReceipt *TxReceipt, err error) {
 	networkID, _ := c.txSender.Info()
-	txReceipt, err := SignBroadcast(tx, c.SigningAccount, c.txSender, networkID)
+	txReceipt, err = SignBroadcast(tx, c.SigningAccount, c.txSender, networkID)
 	if err != nil {
 		return
 	}
-	minedChan := make(chan bool)
-	go txReceipt.Watch(minedChan, blocks, c.txSender)
-	mined = <-minedChan
-	return mined, txReceipt
+
+	mined, err = Wait(txReceipt, blocks, c.txSender)
+	return mined, txReceipt, err
 }
 
 // SetCompiler changes the Context's compiler instance.

aeternity/helpers.go

@@ -152,6 +152,16 @@ func SignBroadcast(tx transactions.Transaction, signingAccount *account.Account,
 	return
 }
 
+// WaitSynchronous blocks until TxReceipt.Watch() reports that a transaction was
+// mined/not mined. It is intended as a convenience function since it makes an
+// asynchronous operation synchronous.
+func WaitSynchronous(txReceipt *TxReceipt, waitBlocks uint64, n getTransactionByHashHeighter) (mined bool, err error) {
+	minedChan := make(chan bool)
+	go txReceipt.Watch(minedChan, waitBlocks, n)
+	mined = <-minedChan
+	return mined, txReceipt.Error
+}
+
 // TxReceipt represents the status of a sent transaction
 type TxReceipt struct {
 	Tx          *transactions.Transaction