core: change interface (#193)

* Extract types.FinalizationResult
* Change interface:
   - Application.BlockConfirmed returns whole block.
   - Application.BlockDelivered returns partial result.

1 files changed, 8 insertions, 7 deletions

diff --git a/core/nonblocking_test.go b/core/nonblocking_test.go
index 7599456..8cd42d0 100644
--- a/core/nonblocking_test.go
+++ b/core/nonblocking_test.go
@@ -57,9 +57,9 @@ func (app *slowApp) VerifyBlock(_ *types.Block) bool {
 	return true
 }
 
-func (app *slowApp) BlockConfirmed(blockHash common.Hash) {
+func (app *slowApp) BlockConfirmed(block types.Block) {
 	time.Sleep(app.sleep)
-	app.blockConfirmed[blockHash] = struct{}{}
+	app.blockConfirmed[block.Hash] = struct{}{}
 }
 
 func (app *slowApp) StronglyAcked(blockHash common.Hash) {
@@ -74,9 +74,10 @@ func (app *slowApp) TotalOrderingDelivered(blockHashes common.Hashes, early bool
 	}
 }
 
-func (app *slowApp) BlockDelivered(block types.Block) {
+func (app *slowApp) BlockDelivered(
+	blockHash common.Hash, _ types.FinalizationResult) {
 	time.Sleep(app.sleep)
-	app.blockDelivered[block.Hash] = struct{}{}
+	app.blockDelivered[blockHash] = struct{}{}
 }
 
 type NonBlockingTestSuite struct {
@@ -96,12 +97,12 @@ func (s *NonBlockingTestSuite) TestNonBlocking() {
 
 	// Start doing some 'heavy' job.
 	for _, hash := range hashes {
-		nbModule.BlockConfirmed(hash)
-		nbModule.StronglyAcked(hash)
-		nbModule.BlockDelivered(types.Block{
+		nbModule.BlockConfirmed(types.Block{
 			Hash:    hash,
 			Witness: types.Witness{Timestamp: time.Now().UTC()},
 		})
+		nbModule.StronglyAcked(hash)
+		nbModule.BlockDelivered(hash, types.FinalizationResult{})
 	}
 	nbModule.TotalOrderingDelivered(hashes, true)