Remove watched addresses fill service code

cerc-io · May 23, 2022 · c25d220 · c25d220
1 parent be34f0e
commit c25d220
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 1,142 deletions.
diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml
@@ -67,8 +67,6 @@ jobs:
       ETH_FORWARD_ETH_CALLS: false
       ETH_PROXY_ON_ERROR: false
       ETH_HTTP_PATH: "go-ethereum:8545"
-      WATCHED_ADDRESS_GAP_FILLER_ENABLED: false
-      WATCHED_ADDRESS_GAP_FILLER_INTERVAL: 2
     strategy:
       matrix:
         go-version: [1.16.x]
@@ -134,8 +132,6 @@ jobs:
       ETH_FORWARD_ETH_CALLS: true
       ETH_PROXY_ON_ERROR: false
       ETH_HTTP_PATH: "go-ethereum:8545"
-      WATCHED_ADDRESS_GAP_FILLER_ENABLED: false
-      WATCHED_ADDRESS_GAP_FILLER_INTERVAL: 2
     strategy:
       matrix:
         go-version: [1.16.x]
@@ -190,72 +186,3 @@ jobs:
           while [ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8081)" != "200" ]; do echo "waiting for ipld-eth-server..." && sleep 5; done && \
           while [ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8545)" != "200" ]; do echo "waiting for geth-statediff..." && sleep 5; done && \
           make integrationtest
-
-  integrationtest_watchedaddress_gapfillingservice:
-    name: Run integration tests for watched addresses with gap filling service enabled
-    env:
-      STACK_ORCHESTRATOR_REF: fcbc74451c5494664fe21f765e89c9c6565c07cb
-      GO_ETHEREUM_REF: 498101102c891c4f8c3cab5649158c642ee1fd6b
-      GOPATH: /tmp/go
-      DB_WRITE: true
-      ETH_FORWARD_ETH_CALLS: false
-      ETH_PROXY_ON_ERROR: false
-      ETH_HTTP_PATH: "go-ethereum:8545"
-      WATCHED_ADDRESS_GAP_FILLER_ENABLED: true
-      WATCHED_ADDRESS_GAP_FILLER_INTERVAL: 2
-    strategy:
-      matrix:
-        go-version: [1.16.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Create GOPATH
-        run: mkdir -p /tmp/go
-      - name: Install Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-      - uses: actions/checkout@v2
-        with:
-          path: "./ipld-eth-server"
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.STACK_ORCHESTRATOR_REF }}
-          path: "./stack-orchestrator/"
-          repository: vulcanize/stack-orchestrator
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.GO_ETHEREUM_REF }}
-          repository: vulcanize/go-ethereum
-          path: "./go-ethereum/"
-      - name: Create config file
-        run: |
-          echo vulcanize_go_ethereum=$GITHUB_WORKSPACE/go-ethereum/ > ./config.sh
-          echo vulcanize_ipld_eth_server=$GITHUB_WORKSPACE/ipld-eth-server/ >> ./config.sh
-          echo db_write=$DB_WRITE >> ./config.sh
-          echo eth_forward_eth_calls=$ETH_FORWARD_ETH_CALLS >> ./config.sh
-          echo eth_proxy_on_error=$ETH_PROXY_ON_ERROR >> ./config.sh
-          echo eth_http_path=$ETH_HTTP_PATH >> ./config.sh
-          echo watched_addres_gap_filler_enabled=$WATCHED_ADDRESS_GAP_FILLER_ENABLED >> ./config.sh
-          echo watched_addres_gap_filler_interval=$WATCHED_ADDRESS_GAP_FILLER_INTERVAL >> ./config.sh
-          cat ./config.sh
-      - name: Build geth
-        run: |
-          cd $GITHUB_WORKSPACE/stack-orchestrator/helper-scripts
-          ./compile-geth.sh \
-          -p "$GITHUB_WORKSPACE/config.sh" \
-          -e docker
-      - name: Run docker compose
-        run: |
-          docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-db.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-ipld-eth-server.yml" \
-          --env-file "$GITHUB_WORKSPACE/config.sh" \
-          up -d --build
-      - name: Test
-        run: |
-          cd $GITHUB_WORKSPACE/ipld-eth-server
-          while [ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8081)" != "200" ]; do echo "waiting for ipld-eth-server..." && sleep 5; done && \
-          while [ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8545)" != "200" ]; do echo "waiting for geth-statediff..." && sleep 5; done && \
-          make integrationtest
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -33,7 +33,6 @@ import (
 	"github.com/vulcanize/gap-filler/pkg/mux"
 
 	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	fill "github.com/vulcanize/ipld-eth-server/v3/pkg/fill"
 	"github.com/vulcanize/ipld-eth-server/v3/pkg/graphql"
 	srpc "github.com/vulcanize/ipld-eth-server/v3/pkg/rpc"
 	s "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
@@ -101,25 +100,12 @@ func serve() {
 		logWithCommand.Info("state validator disabled")
 	}
 
-	var watchedAddressFillService *fill.Service
-	if serverConfig.WatchedAddressGapFillerEnabled {
-		watchedAddressFillService = fill.New(serverConfig)
-		wg.Add(1)
-		go watchedAddressFillService.Start(wg)
-		logWithCommand.Info("watched address gap filler enabled")
-	} else {
-		logWithCommand.Info("watched address gap filler disabled")
-	}
-
 	shutdown := make(chan os.Signal, 1)
 	signal.Notify(shutdown, os.Interrupt)
 	<-shutdown
 	if graphQL != nil {
 		graphQL.Stop()
 	}
-	if watchedAddressFillService != nil {
-		watchedAddressFillService.Stop()
-	}
 	server.Stop()
 	wg.Wait()
 }
@@ -374,10 +360,6 @@ func init() {
 	serveCmd.PersistentFlags().Bool("validator-enabled", false, "turn on the state validator")
 	serveCmd.PersistentFlags().Uint("validator-every-nth-block", 1500, "only validate every Nth block")
 
-	// watched address gap filler flags
-	serveCmd.PersistentFlags().Bool("watched-address-gap-filler-enabled", false, "turn on the watched address gap filler")
-	serveCmd.PersistentFlags().Int("watched-address-gap-filler-interval", 60, "watched address gap fill interval in secs")
-
 	// and their bindings
 	// eth graphql server
 	viper.BindPFlag("eth.server.graphql", serveCmd.PersistentFlags().Lookup("eth-server-graphql"))
@@ -426,8 +408,4 @@ func init() {
 	// state validator flags
 	viper.BindPFlag("validator.enabled", serveCmd.PersistentFlags().Lookup("validator-enabled"))
 	viper.BindPFlag("validator.everyNthBlock", serveCmd.PersistentFlags().Lookup("validator-every-nth-block"))
-
-	// watched address gap filler flags
-	viper.BindPFlag("watch.fill.enabled", serveCmd.PersistentFlags().Lookup("watched-address-gap-filler-enabled"))
-	viper.BindPFlag("watch.fill.interval", serveCmd.PersistentFlags().Lookup("watched-address-gap-filler-interval"))
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,8 +38,6 @@ services:
       ETH_FORWARD_ETH_CALLS: $ETH_FORWARD_ETH_CALLS
       ETH_PROXY_ON_ERROR: $ETH_PROXY_ON_ERROR
       ETH_HTTP_PATH: $ETH_HTTP_PATH
-      WATCHED_ADDRESS_GAP_FILLER_ENABLED: $WATCHED_ADDRESS_GAP_FILLER_ENABLED
-      WATCHED_ADDRESS_GAP_FILLER_INTERVAL: $WATCHED_ADDRESS_GAP_FILLER_INTERVAL
     volumes:
     - type: bind
       source: ./chain.json

diff --git a/environments/example.toml b/environments/example.toml
@@ -28,8 +28,3 @@
     clientName = "Geth" # $ETH_CLIENT_NAME
     genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
     networkID = "1" # $ETH_NETWORK_ID
-
-[watch]
-    [watch.fill]
-        enabled = false
-        interval = 30
diff --git a/pkg/fill/fill_suite_test.go b/pkg/fill/fill_suite_test.go
diff --git a/pkg/fill/service.go b/pkg/fill/service.go