@@ -74,6 +74,10 @@ func (h *testEthHandler) Handle(peer *eth.Peer, packet eth.Packet) error {
7474 }
7575}
7676
77+ func RunTxGenFun () bool {
78+ return false
79+ }
80+
7781// Tests that received transactions are added to the local pool.
7882func TestRecvTransactions66 (t * testing.T ) { testRecvTransactions (t , eth .ETH66 ) }
7983func TestRecvTransactions67 (t * testing.T ) { testRecvTransactions (t , eth .ETH67 ) }
@@ -97,8 +101,8 @@ func testRecvTransactions(t *testing.T, protocol uint) {
97101 defer p2pSrc .Close ()
98102 defer p2pSink .Close ()
99103
100- src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , handler .txpool , nil )
101- sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , handler .txpool , nil )
104+ src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , handler .txpool , RunTxGenFun )
105+ sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , handler .txpool , RunTxGenFun )
102106 defer src .Close ()
103107 defer sink .Close ()
104108
@@ -159,8 +163,8 @@ func testSendTransactions(t *testing.T, protocol uint) {
159163 defer p2pSrc .Close ()
160164 defer p2pSink .Close ()
161165
162- src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , handler .txpool , nil )
163- sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , handler .txpool , nil )
166+ src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , handler .txpool , RunTxGenFun )
167+ sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , handler .txpool , RunTxGenFun )
164168 defer src .Close ()
165169 defer sink .Close ()
166170
@@ -248,8 +252,8 @@ func testTransactionPropagation(t *testing.T, protocol uint) {
248252 defer sourcePipe .Close ()
249253 defer sinkPipe .Close ()
250254
251- sourcePeer := eth .NewPeer (protocol , p2p .NewPeerPipe (enode.ID {byte (i )}, "" , nil , sourcePipe ), sourcePipe , source .txpool , nil )
252- sinkPeer := eth .NewPeer (protocol , p2p .NewPeerPipe (enode.ID {0 }, "" , nil , sinkPipe ), sinkPipe , sink .txpool , nil )
255+ sourcePeer := eth .NewPeer (protocol , p2p .NewPeerPipe (enode.ID {byte (i )}, "" , nil , sourcePipe ), sourcePipe , source .txpool , RunTxGenFun )
256+ sinkPeer := eth .NewPeer (protocol , p2p .NewPeerPipe (enode.ID {0 }, "" , nil , sinkPipe ), sinkPipe , sink .txpool , RunTxGenFun )
253257 defer sourcePeer .Close ()
254258 defer sinkPeer .Close ()
255259
@@ -327,8 +331,8 @@ func testBroadcastBlock(t *testing.T, peers, bcasts int) {
327331 defer sourcePipe .Close ()
328332 defer sinkPipe .Close ()
329333
330- sourcePeer := eth .NewPeer (eth .ETH66 , p2p .NewPeer (enode.ID {byte (i )}, "" , nil ), sourcePipe , nil , nil )
331- sinkPeer := eth .NewPeer (eth .ETH66 , p2p .NewPeer (enode.ID {0 }, "" , nil ), sinkPipe , nil , nil )
334+ sourcePeer := eth .NewPeer (eth .ETH66 , p2p .NewPeer (enode.ID {byte (i )}, "" , nil ), sourcePipe , nil , RunTxGenFun )
335+ sinkPeer := eth .NewPeer (eth .ETH66 , p2p .NewPeer (enode.ID {0 }, "" , nil ), sinkPipe , nil , RunTxGenFun )
332336 defer sourcePeer .Close ()
333337 defer sinkPeer .Close ()
334338
@@ -396,8 +400,8 @@ func testBroadcastMalformedBlock(t *testing.T, protocol uint) {
396400 defer p2pSrc .Close ()
397401 defer p2pSink .Close ()
398402
399- src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , source .txpool , nil )
400- sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , source .txpool , nil )
403+ src := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {1 }, "" , nil ), p2pSrc , source .txpool , RunTxGenFun )
404+ sink := eth .NewPeer (protocol , p2p .NewPeer (enode.ID {2 }, "" , nil ), p2pSink , source .txpool , RunTxGenFun )
401405 defer src .Close ()
402406 defer sink .Close ()
403407
0 commit comments