Merge pull request #851 from iotaledger/fix/commitment-naming

Fix: Naming issue of commitments

pkg/core/promise/promise.go

@@ -49,15 +49,17 @@ func New[T any](optResolver ...func(p *Promise[T])) *Promise[T] {
 	return p
 }
 
-// Resolve resolves the promise with the given result.
-func (p *Promise[T]) Resolve(result T) *Promise[T] {
+// ResolveDynamically resolves the promise with the result of the given resolve function.
+func (p *Promise[T]) ResolveDynamically(resolve func() T) *Promise[T] {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
 	if p.complete {
 		return p
 	}
 
+	result := resolve()
+
 	//nolint:revive
 	p.successCallbacks.ForEach(func(key types.UniqueID, callback func(T)) bool {
 		callback(result)
@@ -79,6 +81,13 @@ func (p *Promise[T]) Resolve(result T) *Promise[T] {
 	return p
 }
 
+// Resolve resolves the promise with the given result.
+func (p *Promise[T]) Resolve(result T) *Promise[T] {
+	return p.ResolveDynamically(func() T {
+		return result
+	})
+}
+
 // Reject rejects the promise with the given error.
 func (p *Promise[T]) Reject(err error) *Promise[T] {
 	p.mutex.Lock()

pkg/protocol/commitments.go

@@ -214,14 +214,13 @@ func (c *Commitments) publishCommitment(commitment *model.Commitment) (published
 	}
 
 	// otherwise try to publish it and determine if we were the goroutine that published it
-	publishedCommitment = newCommitment(c, commitment)
-	cachedRequest.Resolve(publishedCommitment).OnSuccess(func(resolvedCommitment *Commitment) {
-		if published = resolvedCommitment == publishedCommitment; !published {
-			publishedCommitment = resolvedCommitment
-		}
+	cachedRequest.ResolveDynamically(func() *Commitment {
+		published = true
+
+		return newCommitment(c, commitment)
 	})
 
-	return publishedCommitment, published, nil
+	return cachedRequest.Result(), published, nil
 }
 
 // cachedRequest returns a singleton Promise for the given commitmentID. If the Promise does not exist yet, it will be