renames incl. state. conflict to conflicting

plugins/webapi/value/gettransactionbyid/handler.go

@@ -35,7 +35,7 @@ func Handler(c echo.Context) error {
 		Transaction: txn,
 		InclusionState: utils.InclusionState{
 			Confirmed:   txnMeta.Confirmed(),
-			Conflict:  txnMeta.Conflicting(),
+			Conflicting: txnMeta.Conflicting(),
 			Liked:       txnMeta.Liked(),
 			Solid:       txnMeta.Solid(),
 			Rejected:    txnMeta.Rejected(),

plugins/webapi/value/unspentoutputs/handler.go

@@ -53,7 +53,7 @@ func Handler(c echo.Context) error {
 					inclusionState.Liked = txMeta.Liked()
 					inclusionState.Rejected = txMeta.Rejected()
 					inclusionState.Finalized = txMeta.Finalized()
-					inclusionState.Conflict = txMeta.Conflicting()
+					inclusionState.Conflicting = txMeta.Conflicting()
 					inclusionState.Confirmed = txMeta.Confirmed()
 				}
 				outputids = append(outputids, OutputID{

plugins/webapi/value/utils/transaction_handler.go

@@ -68,7 +68,7 @@ type InclusionState struct {
 	Confirmed   bool `json:"confirmed,omitempty"`
 	Rejected    bool `json:"rejected,omitempty"`
 	Liked       bool `json:"liked,omitempty"`
-	Conflict  bool `json:"conflict,omitempty"`
+	Conflicting bool `json:"conflicting,omitempty"`
 	Finalized   bool `json:"finalized,omitempty"`
 	Preferred   bool `json:"preferred,omitempty"`
 }

tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go

@@ -105,7 +105,7 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
 		}, true, tests.ExpectedInclusionState{
 			Confirmed:   tests.False(),
 			Finalized:   tests.False(),
-			Conflict:  tests.False(),
+			Conflicting: tests.False(),
 			Solid:       tests.True(),
 			Rejected:    tests.False(),
 			Liked:       tests.True(),
@@ -151,7 +151,7 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
 	// check that the transactions are marked as conflicting
 	tests.CheckTransactions(t, n.Peers(), expectations, true, tests.ExpectedInclusionState{
 		Finalized:   tests.False(),
-		Conflict:  tests.True(),
+		Conflicting: tests.True(),
 		Solid:       tests.True(),
 	})
 

tools/integration-tests/tester/tests/consensus/consensus_noconflicts_test.go

@@ -72,7 +72,7 @@ func TestConsensusNoConflicts(t *testing.T) {
 		txID: {Inputs: &utilsTx.Inputs, Outputs: &utilsTx.Outputs, Signature: &utilsTx.Signature},
 	}, true, tests.ExpectedInclusionState{
 		Confirmed: tests.True(), Finalized: tests.True(),
-		Conflict: tests.False(), Solid: tests.True(),
+		Conflicting: tests.False(), Solid: tests.True(),
 		Rejected: tests.False(), Liked: tests.True(),
 	})
 
@@ -110,7 +110,7 @@ func TestConsensusNoConflicts(t *testing.T) {
 	tests.CheckTransactions(t, n.Peers(), secondReceiverExpectedTransactions, true,
 		tests.ExpectedInclusionState{
 			Confirmed: tests.True(), Finalized: tests.True(),
-			Conflict: tests.False(), Solid: tests.True(),
+			Conflicting: tests.False(), Solid: tests.True(),
 			Rejected: tests.False(), Liked: tests.True(),
 		},
 	)

tools/integration-tests/tester/tests/testutil.go

@@ -377,7 +377,7 @@ type ExpectedInclusionState struct {
 	// The optional finalized state to check against.
 	Finalized *bool
 	// The optional conflict state to check against.
-	Conflict *bool
+	Conflicting *bool
 	// The optional solid state to check against.
 	Solid *bool
 	// The optional rejected state to check against.
@@ -431,8 +431,8 @@ func CheckTransactions(t *testing.T, peers []*framework.Peer, transactionIDs map
 			if expectedInclusionState.Confirmed != nil {
 				assert.Equal(t, *expectedInclusionState.Confirmed, resp.InclusionState.Confirmed, "confirmed state doesn't match - %s", txId)
 			}
-			if expectedInclusionState.Conflict != nil {
-				assert.Equal(t, *expectedInclusionState.Conflict, resp.InclusionState.Conflict, "conflict state doesn't match - %s", txId)
+			if expectedInclusionState.Conflicting != nil {
+				assert.Equal(t, *expectedInclusionState.Conflicting, resp.InclusionState.Conflicting, "conflict state doesn't match - %s", txId)
 			}
 			if expectedInclusionState.Solid != nil {
 				assert.Equal(t, *expectedInclusionState.Solid, resp.InclusionState.Solid, "solid state doesn't match - %s", txId)
@@ -533,7 +533,7 @@ func AwaitTransactionInclusionState(peers []*framework.Peer, transactionIDs map[
 					if expInclState.Confirmed != nil && *expInclState.Confirmed != tx.InclusionState.Confirmed {
 						continue
 					}
-					if expInclState.Conflict != nil && *expInclState.Conflict != tx.InclusionState.Conflict {
+					if expInclState.Conflicting != nil && *expInclState.Conflicting != tx.InclusionState.Conflicting {
 						continue
 					}
 					if expInclState.Finalized != nil && *expInclState.Finalized != tx.InclusionState.Finalized {