cerc-io/ipld-eth-server
12
0
Fork 1
Code Issues 10 Pull Requests 2 Actions Packages Projects Releases 37 Wiki Activity

update ipfs stack, specifically dshelp.CidToDsKey => dshelp.MultihashToDsKey

Browse Source
This commit is contained in:
Ian Norden
2020-06-22 13:15:29 -05:00
parent 2d4f4ad43c
commit 3dc1bf6955
105 changed files with 1064 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/shared/env.go
+1 -1
View File
@@ -24,7 +24,7 @@ import (
"github.com/btcsuite/btcd/rpcclient"
"github.com/spf13/viper"
"github.com/vulcanize/ipfs-chain-watcher/pkg/core"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
)
// Env variables
pkg/shared/functions.go
+5 -5
View File
@@ -19,7 +19,7 @@ package shared
import (
"bytes"
"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs/ipld"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/ipld"
"github.com/ipfs/go-cid"
@@ -30,7 +30,7 @@ import (
"github.com/jmoiron/sqlx"
"github.com/sirupsen/logrus"
"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
)
// ListContainsString used to check if a list of strings contains a particular string
@@ -88,7 +88,7 @@ func Rollback(tx *sqlx.Tx) {
// PublishIPLD is used to insert an ipld into Postgres blockstore with the provided tx
func PublishIPLD(tx *sqlx.Tx, i node.Node) error {
dbKey := dshelp.CidToDsKey(i.Cid())
dbKey := dshelp.MultihashToDsKey(i.Cid().Hash())
prefixedKey := blockstore.BlockPrefix.String() + dbKey.String()
raw := i.RawData()
_, err := tx.Exec(`INSERT INTO public.blocks (key, data) VALUES ($1, $2) ON CONFLICT (key) DO NOTHING`, prefixedKey, raw)
@@ -112,7 +112,7 @@ func MultihashKeyFromCIDString(c string) (string, error) {
if err != nil {
return "", err
}
dbKey := dshelp.CidToDsKey(dc)
dbKey := dshelp.MultihashToDsKey(dc.Hash())
return blockstore.BlockPrefix.String() + dbKey.String(), nil
}
@@ -122,7 +122,7 @@ func PublishRaw(tx *sqlx.Tx, codec, mh uint64, raw []byte) (string, error) {
if err != nil {
return "", err
}
dbKey := dshelp.CidToDsKey(c)
dbKey := dshelp.MultihashToDsKey(c.Hash())
prefixedKey := blockstore.BlockPrefix.String() + dbKey.String()
_, err = tx.Exec(`INSERT INTO public.blocks (key, data) VALUES ($1, $2) ON CONFLICT (key) DO NOTHING`, prefixedKey, raw)
return c.String(), err
pkg/shared/mocks/payload_fetcher.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"errors"
"sync/atomic"
"github.com/vulcanize/ipfs-chain-watcher/pkg/shared"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
)
// PayloadFetcher mock for tests
pkg/shared/mocks/retriever.go
+2 -2
View File
@@ -17,8 +17,8 @@
package mocks
import (
"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
"github.com/vulcanize/ipfs-chain-watcher/pkg/shared"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
)
// CIDRetriever is a mock CID retriever for use in tests
pkg/shared/mocks/streamer.go
+1 -1
View File
@@ -18,7 +18,7 @@ package mocks
import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/vulcanize/ipfs-chain-watcher/pkg/shared"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
)
// PayloadStreamer mock struct
pkg/shared/test_helpers.go
+3 -3
View File
@@ -17,9 +17,9 @@
package shared
import (
"github.com/vulcanize/ipfs-chain-watcher/pkg/config"
"github.com/vulcanize/ipfs-chain-watcher/pkg/core"
"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/config"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
)
// SetupDB is use to setup a db for super node tests