From d10306edafdfc27c3e1ac2df732aab7eea4d819e Mon Sep 17 00:00:00 2001
From: Luca Moser <moser.luca@gmail.com>
Date: Tue, 16 Jun 2020 10:33:25 +0200
Subject: [PATCH] renames incl. state. conflict to conflicting
---
.../value/gettransactionbyid/handler.go | 14 ++++++-------
.../webapi/value/unspentoutputs/handler.go | 2 +-
.../webapi/value/utils/transaction_handler.go | 14 ++++++-------
.../consensus/consensus_conflicts_test.go | 20 +++++++++----------
.../consensus/consensus_noconflicts_test.go | 4 ++--
.../tester/tests/testutil.go | 8 ++++----
6 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/plugins/webapi/value/gettransactionbyid/handler.go b/plugins/webapi/value/gettransactionbyid/handler.go
index 32a31570..b4bee704 100644
--- a/plugins/webapi/value/gettransactionbyid/handler.go
+++ b/plugins/webapi/value/gettransactionbyid/handler.go
@@ -34,13 +34,13 @@ func Handler(c echo.Context) error {
return c.JSON(http.StatusOK, Response{
Transaction: txn,
InclusionState: utils.InclusionState{
- Confirmed: txnMeta.Confirmed(),
- Conflict: txnMeta.Conflicting(),
- Liked: txnMeta.Liked(),
- Solid: txnMeta.Solid(),
- Rejected: txnMeta.Rejected(),
- Finalized: txnMeta.Finalized(),
- Preferred: txnMeta.Preferred(),
+ Confirmed: txnMeta.Confirmed(),
+ Conflicting: txnMeta.Conflicting(),
+ Liked: txnMeta.Liked(),
+ Solid: txnMeta.Solid(),
+ Rejected: txnMeta.Rejected(),
+ Finalized: txnMeta.Finalized(),
+ Preferred: txnMeta.Preferred(),
},
})
}
diff --git a/plugins/webapi/value/unspentoutputs/handler.go b/plugins/webapi/value/unspentoutputs/handler.go
index 11ac409e..05be4eb5 100644
--- a/plugins/webapi/value/unspentoutputs/handler.go
+++ b/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{
diff --git a/plugins/webapi/value/utils/transaction_handler.go b/plugins/webapi/value/utils/transaction_handler.go
index 1cd0ea40..9664c52d 100644
--- a/plugins/webapi/value/utils/transaction_handler.go
+++ b/plugins/webapi/value/utils/transaction_handler.go
@@ -64,11 +64,11 @@ type Balance struct {
// InclusionState represents the different states of an OutputID
type InclusionState struct {
- Solid bool `json:"solid,omitempty"`
- Confirmed bool `json:"confirmed,omitempty"`
- Rejected bool `json:"rejected,omitempty"`
- Liked bool `json:"liked,omitempty"`
- Conflict bool `json:"conflict,omitempty"`
- Finalized bool `json:"finalized,omitempty"`
- Preferred bool `json:"preferred,omitempty"`
+ Solid bool `json:"solid,omitempty"`
+ Confirmed bool `json:"confirmed,omitempty"`
+ Rejected bool `json:"rejected,omitempty"`
+ Liked bool `json:"liked,omitempty"`
+ Conflicting bool `json:"conflicting,omitempty"`
+ Finalized bool `json:"finalized,omitempty"`
+ Preferred bool `json:"preferred,omitempty"`
}
diff --git a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
index 7c5b0379..e0ebf25a 100644
--- a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
+++ b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go
@@ -103,13 +103,13 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) {
tests.CheckTransactions(t, partition.Peers(), map[string]*tests.ExpectedTransaction{
conflictingTxIDs[i]: nil,
}, true, tests.ExpectedInclusionState{
- Confirmed: tests.False(),
- Finalized: tests.False(),
- Conflict: tests.False(),
- Solid: tests.True(),
- Rejected: tests.False(),
- Liked: tests.True(),
- Preferred: tests.True(),
+ Confirmed: tests.False(),
+ Finalized: tests.False(),
+ Conflicting: tests.False(),
+ Solid: tests.True(),
+ Rejected: tests.False(),
+ Liked: tests.True(),
+ Preferred: tests.True(),
})
}
@@ -150,9 +150,9 @@ 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(),
- Solid: tests.True(),
+ Finalized: tests.False(),
+ Conflicting: tests.True(),
+ Solid: tests.True(),
})
// wait until the voting has finalized
diff --git a/tools/integration-tests/tester/tests/consensus/consensus_noconflicts_test.go b/tools/integration-tests/tester/tests/consensus/consensus_noconflicts_test.go
index b9f5528d..e4840807 100644
--- a/tools/integration-tests/tester/tests/consensus/consensus_noconflicts_test.go
+++ b/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(),
},
)
diff --git a/tools/integration-tests/tester/tests/testutil.go b/tools/integration-tests/tester/tests/testutil.go
index 594e60a7..31332cff 100644
--- a/tools/integration-tests/tester/tests/testutil.go
+++ b/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 {
--
GitLab