From 852c16ff0149cfdb69acc2b87daaf4687dfc70bd Mon Sep 17 00:00:00 2001
From: jimboj <jamesdjohnson218@gmail.com>
Date: Tue, 20 Sep 2022 15:26:25 -0600
Subject: [PATCH] resolve feedback

---
 dot/core/messages_test.go                | 2 +-
 lib/runtime/invalid_transaction.go       | 5 ++---
 lib/runtime/transaction_validity.go      | 4 ++--
 lib/runtime/transaction_validity_test.go | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dot/core/messages_test.go b/dot/core/messages_test.go
index 38bb2fd5e8..44476ffe03 100644
--- a/dot/core/messages_test.go
+++ b/dot/core/messages_test.go
@@ -262,7 +262,7 @@ func TestServiceHandleTransactionMessage(t *testing.T) {
 				setContextStorage: &mockSetContextStorage{trieState: &storage.TrieState{}},
 				validateTxn: &mockValidateTxn{
 					input: types.Extrinsic(append([]byte{byte(types.TxnExternal)}, testExtrinsic[0]...)),
-					err:   *invalidTransaction,
+					err:   invalidTransaction,
 				},
 			},
 			args: args{
diff --git a/lib/runtime/invalid_transaction.go b/lib/runtime/invalid_transaction.go
index 8ec373d1e2..21206b9de8 100644
--- a/lib/runtime/invalid_transaction.go
+++ b/lib/runtime/invalid_transaction.go
@@ -48,14 +48,13 @@ func (i InvalidTransaction) Error() string {
 }
 
 // NewInvalidTransaction is constructor for InvalidTransaction
-func NewInvalidTransaction() *InvalidTransaction {
+func NewInvalidTransaction() InvalidTransaction {
 	vdt, err := scale.NewVaryingDataType(Call{}, Payment{}, Future{}, Stale{}, BadProof{}, AncientBirthBlock{},
 		ExhaustsResources{}, InvalidCustom(0), BadMandatory{}, MandatoryDispatch{})
 	if err != nil {
 		panic(err)
 	}
-	invalidTxnVdr := InvalidTransaction(vdt)
-	return &invalidTxnVdr
+	return InvalidTransaction(vdt)
 }
 
 // Call The call of the transaction is not expected
diff --git a/lib/runtime/transaction_validity.go b/lib/runtime/transaction_validity.go
index bd15aa4309..3131599fca 100644
--- a/lib/runtime/transaction_validity.go
+++ b/lib/runtime/transaction_validity.go
@@ -44,13 +44,13 @@ func (tve TransactionValidityError) Error() string {
 	case UnknownTransaction:
 		return err.Error()
 	default:
-		return fmt.Sprintf("unexpected value: %T %v", err, err)
+		panic(fmt.Sprintf("unexpected value: %T %v", err, err))
 	}
 }
 
 // NewTransactionValidityError is constructor for TransactionValidityError
 func NewTransactionValidityError() *TransactionValidityError {
-	vdt, err := scale.NewVaryingDataType(*NewInvalidTransaction(), NewUnknownTransaction())
+	vdt, err := scale.NewVaryingDataType(NewInvalidTransaction(), NewUnknownTransaction())
 	if err != nil {
 		panic(err)
 	}
diff --git a/lib/runtime/transaction_validity_test.go b/lib/runtime/transaction_validity_test.go
index 10acf227d2..e2683c9929 100644
--- a/lib/runtime/transaction_validity_test.go
+++ b/lib/runtime/transaction_validity_test.go
@@ -82,9 +82,9 @@ func Test_InvalidTransactionValidity(t *testing.T) {
 	_, isParentCorrectType := val.(InvalidTransaction)
 	require.True(t, isParentCorrectType)
 
-	transaction, ok := val.(InvalidTransaction)
+	invTransaction, ok := val.(InvalidTransaction)
 	require.True(t, ok)
-	childVal := transaction.Value()
+	childVal := invTransaction.Value()
 	_, isChildCorrectType := childVal.(Future)
 	require.True(t, isChildCorrectType)
 }
@@ -101,9 +101,9 @@ func Test_UnknownTransactionValidity(t *testing.T) {
 	_, isParentCorrectType := val.(UnknownTransaction)
 	require.True(t, isParentCorrectType)
 
-	transaction, ok := val.(UnknownTransaction)
+	unknownTransaction, ok := val.(UnknownTransaction)
 	require.True(t, ok)
-	childVal := transaction.Value()
+	childVal := unknownTransaction.Value()
 	_, isChildCorrectType := childVal.(NoUnsignedValidator)
 	require.True(t, isChildCorrectType)
 }