This commit is contained in:
i-norden 2022-01-31 14:17:19 -06:00
parent 13686ad80c
commit 056fc82661
6 changed files with 19 additions and 20 deletions

View File

@ -73,8 +73,10 @@ devtools:
.PHONY: statedifftest
statedifftest: | $(GOOSE)
MODE=statediff go test -p 1 ./statediff/... -v
GO111MODULE=on go get github.com/stretchr/testify/assert@v1.7.0
GO111MODULE=on MODE=statediff go test -p 1 ./statediff/... -v
.PHONY: statediff_filewriting_test
statediff_filetest: | $(GOOSE)
MODE=statediff STATEDIFF_DB=file go test -p 1 ./statediff/... -v
GO111MODULE=on go get github.com/stretchr/testify/assert@v1.7.0
GO111MODULE=on MODE=statediff STATEDIFF_DB=file go test -p 1 ./statediff/... -v

View File

@ -6,7 +6,7 @@ services:
image: vulcanize/ipld-eth-db:v0.3.1
environment:
POSTGRES_USER: "vdbm"
POSTGRES_DB: "vulcanize_public"
POSTGRES_DB: "vulcanize_testing_v3"
POSTGRES_PASSWORD: "password"
volumes:
- geth_node:/var/lib/postgresql/data

View File

@ -406,15 +406,20 @@ func TestFileIndexer(t *testing.T) {
var nodeElements []interface{}
for idx, r := range results {
// Decode the log leaf node.
// Attempt to decode the log leaf node.
err = rlp.DecodeBytes(r.Data, &nodeElements)
require.NoError(t, err)
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// 2nd element of the leaf node contains the encoded log data.
test_helpers.ExpectEqual(t, logRaw, nodeElements[1].([]byte))
if len(nodeElements) == 2 {
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// 2nd element of the leaf node contains the encoded log data.
test_helpers.ExpectEqual(t, logRaw, nodeElements[1].([]byte))
} else {
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// raw log was IPLDized
test_helpers.ExpectEqual(t, logRaw, r.Data)
}
}
}
})

View File

@ -277,15 +277,11 @@ func TestPGXIndexer(t *testing.T) {
err = rlp.DecodeBytes(r.Data, &nodeElements)
require.NoError(t, err)
if len(nodeElements) == 2 {
log := new(types.Log)
rlp.DecodeBytes(nodeElements[1].([]byte), log)
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// 2nd element of the leaf node contains the encoded log data.
test_helpers.ExpectEqual(t, logRaw, nodeElements[1].([]byte))
} else {
log := new(types.Log)
rlp.DecodeBytes(r.Data, log)
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// raw log was IPLDized

View File

@ -50,8 +50,8 @@ var DefaultConfig = Config{
Hostname: "localhost",
Port: 5432,
DatabaseName: "vulcanize_testing_v3",
Username: "postgres",
Password: "",
Username: "vdbm",
Password: "password",
}
// Config holds params for a Postgres db

View File

@ -278,15 +278,11 @@ func TestSQLXIndexer(t *testing.T) {
err = rlp.DecodeBytes(r.Data, &nodeElements)
require.NoError(t, err)
if len(nodeElements) == 2 {
log := new(types.Log)
rlp.DecodeBytes(nodeElements[1].([]byte), log)
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// 2nd element of the leaf node contains the encoded log data.
test_helpers.ExpectEqual(t, logRaw, nodeElements[1].([]byte))
} else {
log := new(types.Log)
rlp.DecodeBytes(r.Data, log)
logRaw, err := rlp.EncodeToBytes(expectedLogs[idx])
require.NoError(t, err)
// raw log was IPLDized