refactor machine rest test

Signed-off-by: Lorenz Herzberger <lorenzherzberger@gmail.com>

tests/e2e/machine/rest.go

@@ -2,18 +2,10 @@ package machine
 
 import (
 	"fmt"
-	"net/url"
 	"planetmint-go/testutil"
 	machinetypes "planetmint-go/x/machine/types"
 
-	"github.com/cosmos/cosmos-sdk/client/tx"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
-	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 func (s *E2ETestSuite) TestAttestMachineREST() {
@@ -27,14 +19,6 @@ func (s *E2ETestSuite) TestAttestMachineREST() {
 	addr, err := k.GetAddress()
 	s.Require().NoError(err)
 
-	reqAccountInfo := fmt.Sprintf("%s/cosmos/auth/v1beta1/account_info/%s", baseURL, addr.String())
-	respAccountInfo, err := testutil.GetRequest(reqAccountInfo)
-	s.Require().NoError(err)
-
-	var resAccountInfo authtypes.QueryAccountInfoResponse
-	err = val.ClientCtx.Codec.UnmarshalJSON(respAccountInfo, &resAccountInfo)
-	s.Require().NoError(err)
-
 	// Create Attest Machine TX
 	machine := machinetypes.Machine{
 		Name:             "machine",
@@ -51,76 +35,27 @@ func (s *E2ETestSuite) TestAttestMachineREST() {
 		},
 	}
 
-	txBuilder := val.ClientCtx.TxConfig.NewTxBuilder()
-
 	msg := machinetypes.MsgAttestMachine{
 		Creator: addr.String(),
 		Machine: &machine,
 	}
-	err = txBuilder.SetMsgs(&msg)
+
+	txBytes, err := testutil.PrepareTx(val, &msg, "machine")
 	s.Require().NoError(err)
 
-	txBuilder.SetGasLimit(200000)
+	broadcastTxResponse, err := testutil.BroadcastTx(val, txBytes)
-	txBuilder.SetFeeAmount(sdk.Coins{sdk.NewInt64Coin("stake", 2)})
-	txBuilder.SetTimeoutHeight(0)
-
-	pk, err := k.GetPubKey()
-	s.Require().NoError(err)
-	sk := k.GetLocal().PrivKey
-
-	var priv cryptotypes.PrivKey
-	err = val.ClientCtx.Codec.UnpackAny(sk, &priv)
 	s.Require().NoError(err)
 
-	sigV2 := signing.SignatureV2{
+	s.network.WaitForNextBlock()
-		PubKey: pk,
+	tx, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/tx/v1beta1/txs/%s", val.APIAddress, broadcastTxResponse.TxResponse.TxHash))
-		Data: &signing.SingleSignatureData{
-			SignMode:  val.ClientCtx.TxConfig.SignModeHandler().DefaultMode(),
-			Signature: nil,
-		},
-		Sequence: resAccountInfo.Info.Sequence,
-	}
-
-	err = txBuilder.SetSignatures(sigV2)
 	s.Require().NoError(err)
 
-	signerData := xauthsigning.SignerData{
+	var txRes txtypes.GetTxResponse
-		ChainID:       val.ClientCtx.ChainID,
+	err = val.ClientCtx.Codec.UnmarshalJSON(tx, &txRes)
-		AccountNumber: resAccountInfo.Info.AccountNumber,
-		Sequence:      resAccountInfo.Info.Sequence,
-	}
-	sigV2, err = tx.SignWithPrivKey(
-		val.ClientCtx.TxConfig.SignModeHandler().DefaultMode(), signerData,
-		txBuilder, priv, val.ClientCtx.TxConfig, resAccountInfo.Info.Sequence,
-	)
 	s.Require().NoError(err)
+	s.Require().Equal(uint32(0), txRes.TxResponse.Code)
 
-	err = txBuilder.SetSignatures(sigV2)
+	queryMachineUrl := fmt.Sprintf("%s/planetmint-go/machine/get_machine_by_public_key/%s", baseURL, pubKey)
-	s.Require().NoError(err)
-
-	txBytes, err := val.ClientCtx.TxConfig.TxEncoder()(txBuilder.GetTx())
-	s.Require().NoError(err)
-
-	broadcastTxUrl := fmt.Sprintf("%s/cosmos/tx/v1beta1/txs", baseURL)
-	req := txtypes.BroadcastTxRequest{
-		TxBytes: txBytes,
-		Mode:    txtypes.BroadcastMode_BROADCAST_MODE_SYNC,
-	}
-
-	broadCastTxBody, err := val.ClientCtx.Codec.MarshalJSON(&req)
-	s.Require().NoError(err)
-
-	s.Require().NoError(err)
-	broadCastTxResponse, err := testutil.PostRequest(broadcastTxUrl, "application/json", broadCastTxBody)
-	s.Require().NoError(err)
-
-	var bctRes txtypes.BroadcastTxResponse
-	err = val.ClientCtx.Codec.UnmarshalJSON(broadCastTxResponse, &bctRes)
-	s.Require().NoError(err)
-	s.Require().Equal(uint32(0), bctRes.TxResponse.Code)
-
-	urlPubKey := url.QueryEscape(pubKey)
-	queryMachineUrl := fmt.Sprintf("%s/planetmint-go/machine/get_machine_by_public_key/%s", baseURL, urlPubKey)
 	queryMachineRes, err := testutil.GetRequest(queryMachineUrl)
 	s.Require().NoError(err)