Unify ContextInput and Input

api_v3.go

@@ -437,13 +437,13 @@ func V3API(protoParams ProtocolParameters) API {
 		must(api.RegisterTypeSettings(TransactionEssence{}, serix.TypeSettings{}.WithObjectType(TransactionEssenceNormal)))
 
 		must(api.RegisterTypeSettings(CommitmentInput{},
-			serix.TypeSettings{}.WithObjectType(uint8(ContextInputCommitment))),
+			serix.TypeSettings{}.WithObjectType(uint8(InputCommitment))),
 		)
 		must(api.RegisterTypeSettings(BlockIssuanceCreditInput{},
-			serix.TypeSettings{}.WithObjectType(uint8(ContextInputBlockIssuanceCredit))),
+			serix.TypeSettings{}.WithObjectType(uint8(InputBlockIssuanceCredit))),
 		)
 		must(api.RegisterTypeSettings(RewardInput{},
-			serix.TypeSettings{}.WithObjectType(uint8(ContextInputReward))),
+			serix.TypeSettings{}.WithObjectType(uint8(InputReward))),
 		)
 
 		must(api.RegisterTypeSettings(TxEssenceContextInputs{},

builder/transaction_builder.go

@@ -54,7 +54,7 @@ func (b *TransactionBuilder) AddInput(input *TxInput) *TransactionBuilder {
 type TransactionBuilderInputFilter func(outputID iotago.OutputID, input iotago.Output) bool
 
 // AddContextInput adds the given context input to the builder.
-func (b *TransactionBuilder) AddContextInput(contextInput iotago.ContextInput) *TransactionBuilder {
+func (b *TransactionBuilder) AddContextInput(contextInput iotago.Input) *TransactionBuilder {
 	b.essence.ContextInputs = append(b.essence.ContextInputs, contextInput)
 
 	return b

input.go

@@ -13,6 +13,12 @@ type InputType byte
 const (
 	// InputUTXO is a type of input which references an unspent transaction output.
 	InputUTXO InputType = iota
+	// InputCommitment is a type of input which references a commitment.
+	InputCommitment
+	// InputBlockIssuanceCredit is a type of input which references the block issuance credit from a specific account and commitment, the latter being provided by a commitment input.
+	InputBlockIssuanceCredit
+	// InputReward is a type of input which references an Account or Delegation Input for which to claim rewards.
+	InputReward
 )
 
 func (inputType InputType) String() string {
@@ -23,9 +29,7 @@ func (inputType InputType) String() string {
 	return inputNames[inputType]
 }
 
-var (
-	inputNames = [InputUTXO + 1]string{"UTXOInput"}
-)
+var inputNames = [InputUTXO + 1]string{"UTXOInput"}
 
 var (
 	// ErrRefUTXOIndexInvalid gets returned on invalid UTXO indices.

input_block_issuance_credit.go

@@ -8,8 +8,8 @@ type BlockIssuanceCreditInput struct {
 	AccountID AccountID `serix:"0,mapKey=accountId"`
 }
 
-func (b *BlockIssuanceCreditInput) Type() ContextInputType {
-	return ContextInputBlockIssuanceCredit
+func (b *BlockIssuanceCreditInput) Type() InputType {
+	return InputBlockIssuanceCredit
 }
 
 func (b *BlockIssuanceCreditInput) Size() int {

input_commitment.go

@@ -8,8 +8,8 @@ type CommitmentInput struct {
 	CommitmentID CommitmentID `serix:"0,mapKey=commitmentId"`
 }
 
-func (c *CommitmentInput) Type() ContextInputType {
-	return ContextInputCommitment
+func (c *CommitmentInput) Type() InputType {
+	return InputCommitment
 }
 
 func (c *CommitmentInput) Size() int {

input_context.go

@@ -10,15 +10,6 @@ import (
 // ContextInputType defines the type of context inputs.
 type ContextInputType byte
 
-const (
-	// ContextInputCommitment is a type of input which references a commitment.
-	ContextInputCommitment ContextInputType = iota
-	// ContextInputBlockIssuanceCredit is a type of input which references the block issuance credit from a specific account and commitment, the latter being provided by a commitment input.
-	ContextInputBlockIssuanceCredit
-	// ContextInputReward is a type of input which references an Account or Delegation Input for which to claim rewards.
-	ContextInputReward
-)
-
 func (inputType ContextInputType) String() string {
 	if int(inputType) >= len(contextInputNames) {
 		return fmt.Sprintf("unknown input type: %d", inputType)
@@ -27,12 +18,10 @@ func (inputType ContextInputType) String() string {
 	return contextInputNames[inputType]
 }
 
-var (
-	contextInputNames = [ContextInputReward + 1]string{"CommitmentInput", "BlockIssuanceCreditInput", "RewardInput"}
-)
+var contextInputNames = [InputReward + 1]string{"CommitmentInput", "BlockIssuanceCreditInput", "RewardInput"}
 
 // ContextInputs is a slice of ContextInput.
-type ContextInputs[T ContextInput] []T
+type ContextInputs[T Input] []T
 
 func (in ContextInputs[T]) WorkScore(workScoreStructure *WorkScoreStructure) (WorkScore, error) {
 	// LengthPrefixType
@@ -65,18 +54,9 @@ func (in ContextInputs[T]) Size() int {
 	return sum
 }
 
-// ContextInput provides an additional contextual input for transaction validation.
-type ContextInput interface {
-	Sizer
-	ProcessableObject
-
-	// Type returns the type of ContextInput.
-	Type() ContextInputType
-}
-
 // ContextInputsSyntacticalValidationFunc which given the index of an input and the input itself,
 // runs syntactical validations and returns an error if any should fail.
-type ContextInputsSyntacticalValidationFunc func(index int, input ContextInput) error
+type ContextInputsSyntacticalValidationFunc func(index int, input Input) error
 
 // ContextInputsSyntacticalUnique returns a ContextInputsSyntacticalValidationFunc
 // which checks that
@@ -88,7 +68,7 @@ func ContextInputsSyntacticalUnique() ContextInputsSyntacticalValidationFunc {
 	bicSet := map[string]int{}
 	rewardSet := map[uint16]int{}
 
-	return func(index int, input ContextInput) error {
+	return func(index int, input Input) error {
 		switch castInput := input.(type) {
 		case *BlockIssuanceCreditInput:
 			accountID := castInput.AccountID
@@ -111,6 +91,8 @@ func ContextInputsSyntacticalUnique() ContextInputsSyntacticalValidationFunc {
 				return ierrors.Wrapf(ErrMultipleInputCommitments, "input %d is the second commitment input", index)
 			}
 			hasCommitment = true
+		case *UTXOInput:
+			// ignore as we are evaluating context inputs only
 		default:
 			return ierrors.Wrapf(ErrUnknownContextInputType, "context input %d, tx can only contain CommitmentInputs, BlockIssuanceCreditInputs or RewardInputs", index)
 		}

input_reward.go

@@ -9,8 +9,8 @@ type RewardInput struct {
 	Index uint16 `serix:"0,mapKey=index"`
 }
 
-func (r *RewardInput) Type() ContextInputType {
-	return ContextInputReward
+func (r *RewardInput) Type() InputType {
+	return InputReward
 }
 
 func (r *RewardInput) Size() int {

input_test.go

@@ -62,12 +62,12 @@ func TestInputsSyntacticalUnique(t *testing.T) {
 func TestContextInputsSyntacticalUnique(t *testing.T) {
 	tests := []struct {
 		name    string
-		inputs  iotago.ContextInputs[iotago.ContextInput]
+		inputs  iotago.ContextInputs[iotago.Input]
 		wantErr error
 	}{
 		{
 			name: "ok",
-			inputs: iotago.ContextInputs[iotago.ContextInput]{
+			inputs: iotago.ContextInputs[iotago.Input]{
 				&iotago.CommitmentInput{
 					CommitmentID: tpkg.Rand40ByteArray(),
 				},
@@ -88,7 +88,7 @@ func TestContextInputsSyntacticalUnique(t *testing.T) {
 		},
 		{
 			name: "fail - multiple commitment inputs",
-			inputs: iotago.ContextInputs[iotago.ContextInput]{
+			inputs: iotago.ContextInputs[iotago.Input]{
 				&iotago.CommitmentInput{
 					CommitmentID: tpkg.Rand40ByteArray(),
 				},
@@ -100,7 +100,7 @@ func TestContextInputsSyntacticalUnique(t *testing.T) {
 		},
 		{
 			name: "fail - block issuance credit inputs not unique",
-			inputs: iotago.ContextInputs[iotago.ContextInput]{
+			inputs: iotago.ContextInputs[iotago.Input]{
 				&iotago.BlockIssuanceCreditInput{
 					AccountID: [32]byte{},
 				},
@@ -112,7 +112,7 @@ func TestContextInputsSyntacticalUnique(t *testing.T) {
 		},
 		{
 			name: "fail - reward input not unique",
-			inputs: iotago.ContextInputs[iotago.ContextInput]{
+			inputs: iotago.ContextInputs[iotago.Input]{
 				&iotago.RewardInput{
 					Index: 1,
 				},
@@ -124,7 +124,7 @@ func TestContextInputsSyntacticalUnique(t *testing.T) {
 		},
 		{
 			name: "fail - reward input references index greater than max inputs count",
-			inputs: iotago.ContextInputs[iotago.ContextInput]{
+			inputs: iotago.ContextInputs[iotago.Input]{
 				&iotago.RewardInput{
 					Index: 1,
 				},

transaction_essence.go

@@ -88,7 +88,7 @@ func TransactionEssenceSelector(txType uint32) (*TransactionEssence, error) {
 type InputsCommitment = [InputsCommitmentLength]byte
 
 type (
-	txEssenceContextInput  interface{ ContextInput }
+	txEssenceContextInput  interface{ Input }
 	txEssenceInput         interface{ Input }
 	TxEssenceOutput        interface{ Output }
 	TxEssencePayload       interface{ Payload }