Merge latest changes from master and resolve conflicts

Signed-off-by: Thane Thomson <connect@thanethomson.com>

node/node.go

@@ -289,7 +289,7 @@ func makeNode(
 		evPool,
 		blockStore,
 		eventBus,
-		sm.BlockExecutorWithMetrics(nodeMetrics.state),
+		nodeMetrics.state,
 	)
 
 	// Determine whether we should do block sync. This must happen after the handshake, since the

node/node_test.go

@@ -333,6 +333,7 @@ func TestCreateProposalBlock(t *testing.T) {
 		evidencePool,
 		blockStore,
 		eventBus,
+		sm.NopMetrics(),
 	)
 
 	commit := types.NewCommit(height-1, 0, types.BlockID{}, nil)
@@ -412,6 +413,7 @@ func TestMaxTxsProposalBlockSize(t *testing.T) {
 		sm.EmptyEvidencePool{},
 		blockStore,
 		eventBus,
+		sm.NopMetrics(),
 	)
 
 	commit := types.NewCommit(height-1, 0, types.BlockID{}, nil)
@@ -487,6 +489,7 @@ func TestMaxProposalBlockSize(t *testing.T) {
 		sm.EmptyEvidencePool{},
 		blockStore,
 		eventBus,
+		sm.NopMetrics(),
 	)
 
 	blockID := types.BlockID{