updating vendor because dep is bugging out

vulcanize · Aug 1, 2019 · 2835f21 · 2835f21
1 parent cfbc79e
commit 2835f21
Show file tree

Hide file tree

Showing 1,842 changed files with 96,160 additions and 92,654 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -24,6 +24,9 @@
 #   go-tests = true
 #   unused-packages = true
 
+[[override]]
+  name = "gopkg.in/fsnotify.v1"
+  source = "gopkg.in/fsnotify/fsnotify.v1"
 
 [[constraint]]
   name = "github.com/ipfs/go-cid"
@@ -64,12 +67,12 @@
 
 [[constraint]]
   name = "github.com/vulcanize/vulcanizedb"
-  branch = "syncAndPublish"
+  branch = "ipfs_concurrency"
 
 [[constraint]]
   name = "github.com/ethereum/go-ethereum"
   source = "github.com/vulcanize/go-ethereum"
-  branch = "rpc_statediffing"
+  branch = "statediffing"
 
 [prune]
   go-tests = true

diff --git a/pkg/wrappers/core/rawdb/accessors_chain.go b/pkg/wrappers/core/rawdb/accessors_chain.go
@@ -30,7 +30,7 @@ func (accessor *AccessorsChain) GetBlock(hash common.Hash, number uint64) *types
 }
 
 func (accessor *AccessorsChain) GetBlockReceipts(hash common.Hash, number uint64) types.Receipts {
-	return rawdb.ReadReceipts(accessor.ethDbConnection, hash, number)
+	return rawdb.ReadReceipts(accessor.ethDbConnection, hash, number, nil)
 }
 
 func (accessor *AccessorsChain) GetBody(hash common.Hash, number uint64) *types.Body {

diff --git a/test_helpers/mocks/wrappers/core/state/database.go b/test_helpers/mocks/wrappers/core/state/database.go
@@ -69,6 +69,10 @@ func (*mockStateDatabase) TrieDB() *trie.Database {
 type mockEthDB struct {
 }
 
+func (db *mockEthDB) NewIteratorWithStart(start []byte) ethdb.Iterator {
+	panic("implement me")
+}
+
 func (*mockEthDB) Put(key []byte, value []byte) error {
 	panic("implement me")
 }

diff --git a/vendor/github.com/Stebalien/go-bitfield/go.mod b/vendor/github.com/Stebalien/go-bitfield/go.mod
diff --git a/vendor/github.com/allegro/bigcache/queue/bytes_queue.go b/vendor/github.com/allegro/bigcache/queue/bytes_queue.go
diff --git a/vendor/github.com/allegro/bigcache/shard.go b/vendor/github.com/allegro/bigcache/shard.go
diff --git a/vendor/github.com/aristanetworks/goarista/check_copyright_notice.sh b/vendor/github.com/aristanetworks/goarista/check_copyright_notice.sh
diff --git a/vendor/github.com/aristanetworks/goarista/monotime/issue15006.s b/vendor/github.com/aristanetworks/goarista/monotime/issue15006.s
diff --git a/vendor/github.com/aristanetworks/goarista/monotime/nanotime.go b/vendor/github.com/aristanetworks/goarista/monotime/nanotime.go
diff --git a/vendor/github.com/btcsuite/btcd/btcec/pubkey.go b/vendor/github.com/btcsuite/btcd/btcec/pubkey.go
diff --git a/vendor/github.com/btcsuite/btcd/btcec/signature.go b/vendor/github.com/btcsuite/btcd/btcec/signature.go
diff --git a/vendor/github.com/cenkalti/backoff/go.mod b/vendor/github.com/cenkalti/backoff/go.mod
diff --git a/vendor/github.com/deckarep/golang-set/threadsafe.go b/vendor/github.com/deckarep/golang-set/threadsafe.go
diff --git a/vendor/github.com/edsrzf/mmap-go/mmap.go b/vendor/github.com/edsrzf/mmap-go/mmap.go