remove leftover from merge.

itests/eth_filter_test.go

@@ -1903,100 +1903,6 @@ func ParseEthLog(in map[string]interface{}) (*ethtypes.EthLog, error) {
 	return el, err
 }
 
-func invokeContractAndWaitUntilAllOnChain(t *testing.T, client *kit.TestFullNode, iterations int) (ethtypes.EthAddress, map[ethtypes.EthHash]msgInTipset) {
-	require := require.New(t)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-
-	blockTime := 100 * time.Millisecond
-
-	// install contract
-	contractHex, err := os.ReadFile("contracts/events.bin")
-	require.NoError(err)
-
-	contract, err := hex.DecodeString(string(contractHex))
-	require.NoError(err)
-
-	fromAddr, err := client.WalletDefaultAddress(ctx)
-	require.NoError(err)
-
-	result := client.EVM().DeployContract(ctx, fromAddr, contract)
-
-	idAddr, err := address.NewIDAddress(result.ActorID)
-	require.NoError(err)
-	t.Logf("actor ID address is %s", idAddr)
-
-	msgChan := make(chan msgInTipset, iterations)
-
-	waitAllCh := make(chan struct{})
-	go func() {
-		headChangeCh, err := client.ChainNotify(ctx)
-		require.NoError(err)
-		<-headChangeCh // skip hccurrent
-
-		count := 0
-		for {
-			select {
-			case headChanges := <-headChangeCh:
-				for _, change := range headChanges {
-					if change.Type == store.HCApply || change.Type == store.HCRevert {
-						msgs, err := client.ChainGetMessagesInTipset(ctx, change.Val.Key())
-						require.NoError(err)
-
-						count += len(msgs)
-						for _, m := range msgs {
-							select {
-							case msgChan <- msgInTipset{msg: m, ts: change.Val, reverted: change.Type == store.HCRevert}:
-							default:
-							}
-						}
-
-						if count == iterations {
-							close(msgChan)
-							close(waitAllCh)
-							return
-						}
-					}
-				}
-			}
-		}
-	}()
-
-	time.Sleep(blockTime * 6)
-
-	for i := 0; i < iterations; i++ {
-		// log a four topic event with data
-		ret := client.EVM().InvokeSolidity(ctx, fromAddr, idAddr, []byte{0x00, 0x00, 0x00, 0x02}, nil)
-		require.True(ret.Receipt.ExitCode.IsSuccess(), "contract execution failed")
-	}
-
-	select {
-	case <-waitAllCh:
-	case <-time.After(time.Minute):
-		t.Errorf("timeout to wait for pack messages")
-	}
-
-	received := make(map[ethtypes.EthHash]msgInTipset)
-	for m := range msgChan {
-		eh, err := ethtypes.EthHashFromCid(m.msg.Cid)
-		require.NoError(err)
-		received[eh] = m
-	}
-	require.Equal(iterations, len(received), "all messages on chain")
-
-	head, err := client.ChainHead(ctx)
-	require.NoError(err)
-
-	actor, err := client.StateGetActor(ctx, idAddr, head.Key())
-	require.NoError(err)
-	require.NotNil(actor.Address)
-	ethContractAddr, err := ethtypes.EthAddressFromFilecoinAddress(*actor.Address)
-	require.NoError(err)
-
-	return ethContractAddr, received
-}
-
 func paddedEthBytes(orig []byte) ethtypes.EthBytes {
 	needed := 32 - len(orig)
 	if needed <= 0 {