Merge pull request hyperledger-labs#144 from sergefdrv/fix-starting-prepare-timer

Resolve conflict with changes from "Message interfaces hyperledger-labs#122".

Signed-off-by: Naoya Horiguchi <[email protected]>

Author: nhoriguchi

core/request.go

@@ -188,10 +188,11 @@ func makeRequestApplier(id, n uint32, provideView viewProvider, handleGeneratedU
 		startReqTimer(request, view)
 
 		if isPrimary(view, id, n) {
-			startPrepTimer(request, view)
-
 			prepare := messageImpl.NewPrepare(id, view, request)
+
 			handleGeneratedUIMessage(prepare)
+		} else {
+			startPrepTimer(request, view)
 		}
 
 		return nil

core/request_test.go

@@ -112,13 +112,13 @@ func TestMakeRequestApplier(t *testing.T) {
 
 	mock.On("viewProvider").Return(otherView).Once()
 	mock.On("requestTimerStarter", request, otherView).Once()
+	mock.On("prepareTimerStarter", request, otherView).Once()
 	mock.On("viewReleaser", otherView).Once()
 	err := apply(request)
 	assert.NoError(t, err)
 
 	mock.On("viewProvider").Return(ownView).Once()
 	mock.On("requestTimerStarter", request, ownView).Once()
-	mock.On("prepareTimerStarter", request, ownView).Once()
 	mock.On("generatedUIMessageHandler", prepare).Once()
 	mock.On("viewReleaser", ownView).Once()
 	err = apply(request)