From 4be3b9b1b4011bbcd5ab99c6a3d195fa1c36355b Mon Sep 17 00:00:00 2001 From: Abdul Rabbani Date: Tue, 17 May 2022 11:58:39 -0400 Subject: [PATCH] Utilize new ipld-ethcl-db repository --- .github/workflows/on-pr.yml | 30 ++++++++++++++-------------- README.md | 6 +++--- internal/boot/boot_test.go | 2 +- internal/shutdown/shutdown_test.go | 2 +- pkg/beaconclient/capturehead_test.go | 6 ++++-- pkg/database/sql/postgres/config.go | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index ac1aee3..eb6827a 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -7,8 +7,8 @@ on: description: "The branch, commit or sha from stack-orchestrator to checkout" required: false default: "main" - ipld-eth-db-ref: - description: "The branch, commit or sha from ipld-eth-db to checkout" + ipld-ethcl-db-ref: + description: "The branch, commit or sha from ipld-ethcl-db to checkout" required: false default: "main" ssz-data-ref: @@ -26,7 +26,7 @@ on: env: stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref || 'feature/client-build'}} - ipld-eth-db-ref: ${{ github.event.inputs.ipld-eth-db-ref || 'minimal-beacon-chain-schema' }} + ipld-ethcl-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref || 'feature/schema-ipld-ethcl-indexer' }} ssz-data-ref: ${{ github.event.inputs.ssz-data-ref || 'main' }} GOPATH: /tmp/go jobs: @@ -47,14 +47,14 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ env.ipld-eth-db-ref }} - repository: vulcanize/ipld-eth-db - path: "./ipld-eth-db/" + ref: ${{ env.ipld-ethcl-db-ref }} + repository: vulcanize/ipld-ethcl-db + path: "./ipld-ethcl-db/" fetch-depth: 0 - name: Create config file run: | - echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > ./config.sh + echo vulcanize_ipld_ethcl_db=$GITHUB_WORKSPACE/ipld-ethcl-db/ > ./config.sh echo vulcanize_ipld_ethcl_indexer=$GITHUB_WORKSPACE/ipld-ethcl-indexer >> ./config.sh echo ethcl_capture_mode=boot >> ./config.sh echo ethcl_skip_sync=true >> ./config.sh @@ -98,9 +98,9 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ env.ipld-eth-db-ref }} - repository: vulcanize/ipld-eth-db - path: "./ipld-eth-db/" + ref: ${{ env.ipld-ethcl-db-ref }} + repository: vulcanize/ipld-ethcl-db + path: "./ipld-ethcl-db/" fetch-depth: 0 - uses: actions/checkout@v3 @@ -112,7 +112,7 @@ jobs: - name: Create config file run: | - echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > ./config.sh + echo vulcanize_ipld_ethcl_db=$GITHUB_WORKSPACE/ipld-ethcl-db/ > ./config.sh echo vulcanize_ipld_ethcl_indexer=$GITHUB_WORKSPACE/ipld-ethcl-indexer >> ./config.sh cat ./config.sh @@ -158,14 +158,14 @@ jobs: - uses: actions/checkout@v3 with: - ref: ${{ env.ipld-eth-db-ref }} - repository: vulcanize/ipld-eth-db - path: "./ipld-eth-db/" + ref: ${{ env.ipld-ethcl-db-ref }} + repository: vulcanize/ipld-ethcl-db + path: "./ipld-ethcl-db/" fetch-depth: 0 - name: Create config file run: | - echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > ./config.sh + echo vulcanize_ipld_ethcl_db=$GITHUB_WORKSPACE/ipld-ethcl-db/ > ./config.sh echo vulcanize_ipld_ethcl_indexer=$GITHUB_WORKSPACE/ipld-ethcl-indexer >> ./config.sh echo ethcl_capture_mode=boot >> ./config.sh cat ./config.sh diff --git a/README.md b/README.md index cd268ca..cf285e2 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ To run the application, do as follows: 1. Setup the prerequisite applications. a. Run a beacon client (such as lighthouse). - b. Run a postgres DB. + b. Run a postgres DB for ethcl. c. You can utilize the `stack-orchestrator` [repository](https://github.com/vulcanize/stack-orchestrato). ``` ./wrapper.sh -e skip \ - -d ../docker/local/docker-compose-db.yml \ + -d ../docker/local/docker-compose-ethcl-db.yml \ -d ../docker/latest/docker-compose-lighthouse.yml \ -v remove \ -p ../local-config.sh @@ -39,7 +39,7 @@ To run the application, do as follows: ``` go run -race main.go capture head --db.address localhost \ --db.password password \ - --db.port 8077 \ + --db.port 8076 \ --db.username vdbm \ --db.name vulcanize_testing \ --db.driver PGX \ diff --git a/internal/boot/boot_test.go b/internal/boot/boot_test.go index ca83653..aa73a9e 100644 --- a/internal/boot/boot_test.go +++ b/internal/boot/boot_test.go @@ -11,7 +11,7 @@ import ( var _ = Describe("Boot", func() { var ( dbAddress string = "localhost" - dbPort int = 8077 + dbPort int = 8076 dbName string = "vulcanize_testing" dbUsername string = "vdbm" dbPassword string = "password" diff --git a/internal/shutdown/shutdown_test.go b/internal/shutdown/shutdown_test.go index bfb430c..f9fb9d1 100644 --- a/internal/shutdown/shutdown_test.go +++ b/internal/shutdown/shutdown_test.go @@ -23,7 +23,7 @@ import ( var _ = Describe("Shutdown", func() { var ( dbAddress string = "localhost" - dbPort int = 8077 + dbPort int = 8076 dbName string = "vulcanize_testing" dbUsername string = "vdbm" dbPassword string = "password" diff --git a/pkg/beaconclient/capturehead_test.go b/pkg/beaconclient/capturehead_test.go index aea71fc..ef3b259 100644 --- a/pkg/beaconclient/capturehead_test.go +++ b/pkg/beaconclient/capturehead_test.go @@ -54,7 +54,7 @@ var _ = Describe("Capturehead", func() { protocol string = "http" TestEvents map[string]Message dbHost string = "localhost" - dbPort int = 8077 + dbPort int = 8076 dbName string = "vulcanize_testing" dbUser string = "vdbm" dbPassword string = "password" @@ -657,7 +657,8 @@ func (tbc TestBeaconNode) provideSsz(slotIdentifier string, sszIdentifier string } slot, err := strconv.ParseUint(Message.HeadMessage.Slot, 10, 64) Expect(err).ToNot(HaveOccurred()) - state.SetSlot(types.Slot(slot)) + err = state.SetSlot(types.Slot(slot)) + Expect(err).ToNot(HaveOccurred()) return state.MarshalSSZ() } } @@ -780,6 +781,7 @@ func (tbc TestBeaconNode) testMultipleHead(bc *beaconclient.BeaconClient, firstH // This function will make sure we are properly able to get the SszRoot of the SignedBeaconBlock and the BeaconState. func testSszRoot(msg Message) { state, vm, err := readBeaconState(msg.BeaconState) + Expect(err).ToNot(HaveOccurred()) stateRoot, err := state.HashTreeRoot(context.Background()) Expect(err).ToNot(HaveOccurred()) Expect(msg.HeadMessage.State).To(Equal("0x" + hex.EncodeToString(stateRoot[:]))) diff --git a/pkg/database/sql/postgres/config.go b/pkg/database/sql/postgres/config.go index efe5eb9..8f57bcd 100644 --- a/pkg/database/sql/postgres/config.go +++ b/pkg/database/sql/postgres/config.go @@ -18,7 +18,7 @@ const ( // DefaultConfig are default parameters for connecting to a Postgres sql var DefaultConfig = Config{ Hostname: "localhost", - Port: 8077, + Port: 8076, DatabaseName: "vulcanize_testing", Username: "vdbm", Password: "password",