clean api

Author: xDarksome

ballot_protocol.go

@@ -122,7 +122,7 @@ func (b *ballotProtocol) prepareVoted(m *Message) {
 	//fmt.Println(b.id, "see", m.NodeID, "has voted prepare", m.SlotIndex, m.Counter, string(m.Value))
 
 	b.updateBallotCounter(m.NodeID, m.Counter)
-	ballot := b.ballots.FindOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
+	ballot := b.ballots.findOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
 	ballot.prepare.votedBy(m.NodeID)
 
 	if !ballot.prepare.accepted && ballot.prepare.votes.reachedQuorumThreshold(b.quorumSlices) {
@@ -133,7 +133,7 @@ func (b *ballotProtocol) prepareVoted(m *Message) {
 func (b *ballotProtocol) prepareAccepted(m *Message) {
 	//fmt.Println(b.id, "see", m.NodeID, "has accepted prepare", m.SlotIndex, m.Counter, string(m.Value))
 	b.updateBallotCounter(m.NodeID, m.Counter)
-	ballot := b.ballots.FindOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
+	ballot := b.ballots.findOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
 	ballot.prepare.acceptedBy(m.NodeID)
 
 	if !ballot.prepare.accepted && ballot.prepare.accepts.reachedBlockingThreshold(b.quorumSlices) {
@@ -148,7 +148,7 @@ func (b *ballotProtocol) prepareAccepted(m *Message) {
 func (b *ballotProtocol) commitVoted(m *Message) {
 	//fmt.Println(b.id, "see", m.NodeID, "has voted commit", m.SlotIndex, m.Counter, string(m.Value))
 	b.updateBallotCounter(m.NodeID, m.Counter)
-	ballot := b.ballots.FindOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
+	ballot := b.ballots.findOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
 	ballot.commit.votedBy(m.NodeID)
 
 	if !ballot.commit.accepted && ballot.commit.votes.reachedQuorumThreshold(b.quorumSlices) {
@@ -159,7 +159,7 @@ func (b *ballotProtocol) commitVoted(m *Message) {
 func (b *ballotProtocol) commitAccepted(m *Message) {
 	//fmt.Println(b.id, "see", m.NodeID, "has accepted commit", m.SlotIndex, m.Counter, string(m.Value))
 	b.updateBallotCounter(m.NodeID, m.Counter)
-	ballot := b.ballots.FindOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
+	ballot := b.ballots.findOrCreate(m.SlotIndex, m.Counter, m.Value, b.quorumSlices)
 	ballot.commit.acceptedBy(m.NodeID)
 
 	if !ballot.commit.accepted && ballot.commit.accepts.reachedBlockingThreshold(b.quorumSlices) {
@@ -172,7 +172,7 @@ func (b *ballotProtocol) commitAccepted(m *Message) {
 }
 
 func (b *ballotProtocol) votePrepare() {
-	ballot := b.ballots.FindOrCreate(
+	ballot := b.ballots.findOrCreate(
 		b.currentBallot.slotIndex,
 		b.currentBallot.counter,
 		b.currentBallot.value,

ballots.go

@@ -53,7 +53,7 @@ func newBallots() ballots {
 	}
 }
 
-func (b ballots) FindOrCreate(slotIndex uint64, counter uint32, value Value, slices quorumSlices) *ballot {
+func (b ballots) findOrCreate(slotIndex uint64, counter uint32, value Value, slices quorumSlices) *ballot {
 	bal := &ballot{slotIndex: slotIndex, counter: counter, value: value}
 	if item := b.btree.Get(bal); item != nil {
 		return item.(*ballot)

nominates.go

@@ -23,24 +23,24 @@ func newNominates() nominates {
 	return nominates{btree.New(100)}
 }
 
-func (n nominates) FindOrCreate(value Value, slices quorumSlices) *nominate {
-	nom := n.Find(value)
+func (n nominates) findOrCreate(value Value, slices quorumSlices) *nominate {
+	nom := n.find(value)
 	if nom == nil {
-		nom = n.Create(value, slices)
+		nom = n.create(value, slices)
 	}
 
 	return nom
 }
 
-func (n nominates) Find(value Value) *nominate {
+func (n nominates) find(value Value) *nominate {
 	if item := n.btree.Get(&nominate{value: value}); item != nil {
 		return item.(*nominate)
 	}
 
 	return nil
 }
 
-func (n nominates) Create(value Value, slices quorumSlices) *nominate {
+func (n nominates) create(value Value, slices quorumSlices) *nominate {
 	nominate := &nominate{
 		value:        value,
 		ratification: newRatification(),

nomination_protocol.go

@@ -46,8 +46,8 @@ func (n *nominationProtocol) considerProposal(v Value) {
 		return
 	}
 
-	if nominate := n.nominates.Find(v); nominate == nil {
-		nominate = n.nominates.Create(v, n.quorumSlices)
+	if nominate := n.nominates.find(v); nominate == nil {
+		nominate = n.nominates.create(v, n.quorumSlices)
 		n.voteNominate(nominate)
 	}
 }
@@ -87,12 +87,12 @@ func (n *nominationProtocol) reinit(m protocolMessage) {
 }
 
 func (n *nominationProtocol) nominateVoted(m *Message) {
-	nominate := n.nominates.Find(m.Value)
+	nominate := n.nominates.find(m.Value)
 	if nominate == nil {
 		if !n.validator.ValidateValue(m.Value) {
 			return
 		}
-		nominate = n.nominates.Create(m.Value, n.quorumSlices)
+		nominate = n.nominates.create(m.Value, n.quorumSlices)
 		n.voteNominate(nominate)
 	}
 
@@ -104,7 +104,7 @@ func (n *nominationProtocol) nominateVoted(m *Message) {
 
 func (n *nominationProtocol) nominateAccepted(m *Message) {
 	//fmt.Println(n.id, "see", m.NodeID, "has accepted nominate", m.SlotIndex, string(m.Value))
-	nominate := n.nominates.FindOrCreate(m.Value, n.quorumSlices)
+	nominate := n.nominates.findOrCreate(m.Value, n.quorumSlices)
 	nominate.acceptedBy(m.NodeID)
 
 	if !nominate.accepted && nominate.accepts.reachedBlockingThreshold(n.quorumSlices) {