From 8cc454b5a0129754f9314b38ca85ce532f4bed9d Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Wed, 24 Jul 2024 19:06:14 +0800 Subject: [PATCH] update ipld-eth-server, eth stack --- .github/workflows/test.yml | 2 +- go.mod | 8 ++++---- go.sum | 20 ++++++++++---------- pkg/validator/ref_integrity_test.go | 3 ++- pkg/validator/validator_test.go | 6 +++++- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1ed25a6..45384ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ on: env: SO_VERSION: v1.1.0-36d4969-202407091537 - FIXTURENET_ETH_STACKS_REF: roysc/set-validator-creds # TODO: merge + FIXTURENET_ETH_STACKS_REF: main jobs: unit-tests: diff --git a/go.mod b/go.mod index c7e43dd..1784ab9 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/cerc-io/ipfs-ethdb/v5 v5.1.0-alpha - github.com/cerc-io/ipld-eth-server/v5 v5.2.0-alpha - github.com/cerc-io/ipld-eth-statedb v0.1.0 - github.com/cerc-io/plugeth-statediff v0.2.1 + github.com/cerc-io/ipld-eth-server/v5 v5.3.0-alpha + github.com/cerc-io/ipld-eth-statedb v0.1.1 + github.com/cerc-io/plugeth-statediff v0.3.2 github.com/ethereum/go-ethereum v1.13.14 github.com/holiman/uint256 v1.2.4 github.com/jmoiron/sqlx v1.3.5 @@ -33,7 +33,7 @@ require ( github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cerc-io/eth-ipfs-state-validator/v5 v5.2.0-alpha // indirect - github.com/cerc-io/eth-iterator-utils v0.2.0 // indirect + github.com/cerc-io/eth-iterator-utils v0.3.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cockroachdb/errors v1.10.0 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect diff --git a/go.sum b/go.sum index 02efacb..a654e23 100644 --- a/go.sum +++ b/go.sum @@ -81,18 +81,18 @@ github.com/ceramicnetwork/go-dag-jose v0.1.0 h1:yJ/HVlfKpnD3LdYP03AHyTvbm3BpPiz2 github.com/ceramicnetwork/go-dag-jose v0.1.0/go.mod h1:qYA1nYt0X8u4XoMAVoOV3upUVKtrxy/I670Dg5F0wjI= github.com/cerc-io/eth-ipfs-state-validator/v5 v5.2.0-alpha h1:gpEk3BQQhnkilXxP12q77LSiIAvXfTdQ+4xxIv/JWiI= github.com/cerc-io/eth-ipfs-state-validator/v5 v5.2.0-alpha/go.mod h1:xmazdaZ/CUaXt52Mvd0KU7dcbJM3glvJzA2mEpVMgbM= -github.com/cerc-io/eth-iterator-utils v0.2.0 h1:wikAfWZ0fAqLqUy/Ud/a1n9p/arVeKG8P8tRjZE7oBg= -github.com/cerc-io/eth-iterator-utils v0.2.0/go.mod h1:wDUJvwKDSOdqTIyeG+yXJ2ckzc9f2Fem614fV61DBcg= -github.com/cerc-io/eth-testing v0.4.0 h1:ivGbXnEqlXMt/3m3jbsPJaVT7ZDTenFQWCryt1Rd/Jk= -github.com/cerc-io/eth-testing v0.4.0/go.mod h1:CVsmHjFldX9gwaQSQwGmKbmh0g6Dq+bsqB2CxBf9zbk= +github.com/cerc-io/eth-iterator-utils v0.3.1 h1:h4Bp0+fUiwkyug1uCEO2LZr2qxoW1yKszV2EO/2CDB0= +github.com/cerc-io/eth-iterator-utils v0.3.1/go.mod h1:UNrjsP5bApZkqqqfU7nmnPN/dIIo9GOUUD79tmoX/s4= +github.com/cerc-io/eth-testing v0.5.1 h1:xxcQf9ymJS0911yWIrUiGvCvqfvEjYmHvhBJkCD/whs= +github.com/cerc-io/eth-testing v0.5.1/go.mod h1:p86je2PjSM7u8Qd7rMIG/Zw+tQlBoS5Emkh1ECnC5t0= github.com/cerc-io/ipfs-ethdb/v5 v5.1.0-alpha h1:+XhYHvzC3zFIvcWEb466SNDfeLrvcW3xe/d0cbVVVRA= github.com/cerc-io/ipfs-ethdb/v5 v5.1.0-alpha/go.mod h1:w5g07b6Uz+c6r/ySml58TEOJdUYAibYYF05H5ULVv2I= -github.com/cerc-io/ipld-eth-server/v5 v5.2.0-alpha h1:ZDG5U456ttTbuY8VBJqzGueyppBCiNOAGg/UXlEomTw= -github.com/cerc-io/ipld-eth-server/v5 v5.2.0-alpha/go.mod h1:XlVPHVsF6u8kg1Ci8g8/yIzP2nbrRFsOXTST71g8GlE= -github.com/cerc-io/ipld-eth-statedb v0.1.0 h1:K2Xy8hgmkSRmHaqmw0CZf9hWX0r8/r0563O7osmyVBE= -github.com/cerc-io/ipld-eth-statedb v0.1.0/go.mod h1:Lo4TKVs7bTGr2b7L9ccmo/EMV96/nGE7T/GYliuOHlM= -github.com/cerc-io/plugeth-statediff v0.2.1 h1:zUbkazJW0omFGg7z/9MJnttox4VRurLW1pFytDlRQjM= -github.com/cerc-io/plugeth-statediff v0.2.1/go.mod h1:n85L2n8Q3bQVlAVFnyk2soCLJW+YFKGe3DVRauEaS2s= +github.com/cerc-io/ipld-eth-server/v5 v5.3.0-alpha h1:3Gh5amJft+yxBwkxy0l61tICgoiETR0EGCxF1Ma5P/Q= +github.com/cerc-io/ipld-eth-server/v5 v5.3.0-alpha/go.mod h1:0NXLwk9KegKqDFalOItzW79whBE5GPhg5gdu6FIBWR4= +github.com/cerc-io/ipld-eth-statedb v0.1.1 h1:QvhdO9jZqQu+NmiilW4Ef4N3qbdN4+FRHwVVbHg7Q/w= +github.com/cerc-io/ipld-eth-statedb v0.1.1/go.mod h1:+BF5xGXodtUFlNZ9W3JYsUHRmPyso+td8IgB+x/bYjM= +github.com/cerc-io/plugeth-statediff v0.3.2 h1:GuOUqDT6nJRCikyaNxDI2pA7TRnOTWOcyJGlJtwSzHY= +github.com/cerc-io/plugeth-statediff v0.3.2/go.mod h1:r6Mzc6k4V9KD+iN9AXa/LmmRISDsQnnIwKzZMFjJ+eE= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= diff --git a/pkg/validator/ref_integrity_test.go b/pkg/validator/ref_integrity_test.go index c1e9b13..7e8d2c8 100644 --- a/pkg/validator/ref_integrity_test.go +++ b/pkg/validator/ref_integrity_test.go @@ -6,6 +6,7 @@ import ( "math/big" "testing" + indexer_helpers "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" helpers "github.com/cerc-io/plugeth-statediff/test_helpers" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" @@ -67,7 +68,7 @@ var _ = Describe("referential integrity", Ordered, func() { db = SetupDB() }) - AfterAll(func() { helpers.ClearDB(db) }) + AfterAll(func() { Expect(indexer_helpers.ClearSqlxDB(db)).ToNot(HaveOccurred()) }) BeforeEach(func() { tx = db.MustBegin() }) AfterEach(func() { diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go index 0d6cd26..1cee8ad 100644 --- a/pkg/validator/validator_test.go +++ b/pkg/validator/validator_test.go @@ -6,12 +6,14 @@ import ( "testing" "github.com/cerc-io/plugeth-statediff/indexer/ipld" + indexer_helpers "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" helpers "github.com/cerc-io/plugeth-statediff/test_helpers" sdtypes "github.com/cerc-io/plugeth-statediff/types" "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rpc" "github.com/jmoiron/sqlx" + // import server helpers for non-canonical chain data server_mocks "github.com/cerc-io/ipld-eth-server/v5/pkg/eth/test_helpers" @@ -98,7 +100,9 @@ func setupStateValidator(t *testing.T) *sqlx.DB { db := SetupDB() t.Cleanup(func() { - helpers.ClearDB(db) + if err := indexer_helpers.ClearSqlxDB(db); err != nil { + t.Fatal(err) + } }) return db }