deep-stack/ipld-eth-server
6
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

Apply go fmt

Browse Source
This commit is contained in:
Elizabeth Engelman 2019-07-08 17:52:06 -05:00
parent dc06991605
commit ee244ac6f5
6 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/shared/fetcher/geth_rpc_storage_fetcher.go
View File

@ -22,15 +22,15 @@ import (
"github.com/vulcanize/vulcanizedb/libraries/shared/streamer" "github.com/vulcanize/vulcanizedb/libraries/shared/streamer"
) )
type GethRpcStorageFetcher struct{ type GethRpcStorageFetcher struct {
statediffPayloadChan chan statediff.Payload statediffPayloadChan chan statediff.Payload
streamer streamer.Streamer streamer streamer.Streamer
} }
func NewGethRpcStorageFetcher(streamer streamer.Streamer, statediffPayloadChan chan statediff.Payload) GethRpcStorageFetcher{ func NewGethRpcStorageFetcher(streamer streamer.Streamer, statediffPayloadChan chan statediff.Payload) GethRpcStorageFetcher {
return GethRpcStorageFetcher{ return GethRpcStorageFetcher{
statediffPayloadChan: statediffPayloadChan, statediffPayloadChan: statediffPayloadChan,
streamer: streamer, streamer: streamer,
} }
} }
@ -64,6 +64,6 @@ func (fetcher *GethRpcStorageFetcher) FetchStorageDiffs(out chan<- utils.Storage
} }
func getAccountDiffs(stateDiff statediff.StateDiff) []statediff.AccountDiff { func getAccountDiffs(stateDiff statediff.StateDiff) []statediff.AccountDiff {
accounts :=append(stateDiff.CreatedAccounts, stateDiff.UpdatedAccounts...) accounts := append(stateDiff.CreatedAccounts, stateDiff.UpdatedAccounts...)
return append(accounts, stateDiff.DeletedAccounts...) return append(accounts, stateDiff.DeletedAccounts...)
} }

7
libraries/shared/fetcher/geth_rpc_storage_fetcher_test.go
View File

@ -27,9 +27,9 @@ import (
) )
type MockStoragediffStreamer struct { type MockStoragediffStreamer struct {
subscribeError error subscribeError error
PassedPayloadChan chan statediff.Payload PassedPayloadChan chan statediff.Payload
streamPayloads []statediff.Payload streamPayloads []statediff.Payload
} }
func (streamer *MockStoragediffStreamer) Stream(statediffPayloadChan chan statediff.Payload) (*rpc.ClientSubscription, error) { func (streamer *MockStoragediffStreamer) Stream(statediffPayloadChan chan statediff.Payload) (*rpc.ClientSubscription, error) {
@ -60,7 +60,6 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
var storagediffRowChan chan utils.StorageDiffRow var storagediffRowChan chan utils.StorageDiffRow
var errorChan chan error var errorChan chan error
BeforeEach(func() { BeforeEach(func() {
streamer = MockStoragediffStreamer{} streamer = MockStoragediffStreamer{}
statediffPayloadChan = make(chan statediff.Payload, 1) statediffPayloadChan = make(chan statediff.Payload, 1)
@ -128,4 +127,4 @@ var _ = Describe("Geth RPC Storage Fetcher", func() {
close(done) close(done)
}) })
}) })

1
libraries/shared/streamer/statediff_streamer_test.go
View File

@ -33,4 +33,3 @@ var _ = Describe("StateDiff Streamer", func() {
client.AssertSubscribeCalledWith("statediff", payloadChan, []interface{}{"stream"}) client.AssertSubscribeCalledWith("statediff", payloadChan, []interface{}{"stream"})
}) })
}) })

3
libraries/shared/test_data/statediff.go
View File

@ -48,7 +48,7 @@ var (
anotherContractAddress = common.HexToAddress("0xaE9BEa628c4Ce503DcFD7E305CaB4e29E7476593") anotherContractAddress = common.HexToAddress("0xaE9BEa628c4Ce503DcFD7E305CaB4e29E7476593")
AnotherContractLeafKey = crypto.Keccak256Hash(anotherContractAddress[:]) AnotherContractLeafKey = crypto.Keccak256Hash(anotherContractAddress[:])
testAccount = state.Account{ testAccount = state.Account{
Nonce: NewNonceValue, Nonce: NewNonceValue,
Balance: big.NewInt(NewBalanceValue), Balance: big.NewInt(NewBalanceValue),
Root: ContractRoot, Root: ContractRoot,
@ -125,4 +125,3 @@ var (
Err: errors.New("mock error"), Err: errors.New("mock error"),
} }
) )

29
pkg/fakes/mock_rpc_client.go
View File

@ -32,21 +32,21 @@ import (
) )
type MockRpcClient struct { type MockRpcClient struct {
callContextErr error callContextErr error
ipcPath string ipcPath string
nodeType core.NodeType nodeType core.NodeType
passedContext context.Context passedContext context.Context
passedMethod string passedMethod string
passedResult interface{} passedResult interface{}
passedBatch []client.BatchElem passedBatch []client.BatchElem
passedNamespace string passedNamespace string
passedPayloadChan chan statediff.Payload passedPayloadChan chan statediff.Payload
passedSubscribeArgs []interface{} passedSubscribeArgs []interface{}
lengthOfBatch int lengthOfBatch int
returnPOAHeader core.POAHeader returnPOAHeader core.POAHeader
returnPOAHeaders []core.POAHeader returnPOAHeaders []core.POAHeader
returnPOWHeaders []*types.Header returnPOWHeaders []*types.Header
supportedModules map[string]string supportedModules map[string]string
} }
func (client *MockRpcClient) Subscribe(namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error) { func (client *MockRpcClient) Subscribe(namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error) {
@ -66,7 +66,6 @@ func (client *MockRpcClient) Subscribe(namespace string, payloadChan interface{}
return &subscription, nil return &subscription, nil
} }
func (client *MockRpcClient) AssertSubscribeCalledWith(namespace string, payloadChan chan statediff.Payload, args []interface{}) { func (client *MockRpcClient) AssertSubscribeCalledWith(namespace string, payloadChan chan statediff.Payload, args []interface{}) {
Expect(client.passedNamespace).To(Equal(namespace)) Expect(client.passedNamespace).To(Equal(namespace))
Expect(client.passedPayloadChan).To(Equal(payloadChan)) Expect(client.passedPayloadChan).To(Equal(payloadChan))

2
pkg/geth/client/rpc_client.go
View File

@ -88,4 +88,4 @@ func (client RpcClient) Subscribe(namespace string, payloadChan interface{}, arg
return nil, errors.New("channel given to Subscribe must not be nil") return nil, errors.New("channel given to Subscribe must not be nil")
} }
return client.client.Subscribe(context.Background(), namespace, payloadChan, args...) return client.client.Subscribe(context.Background(), namespace, payloadChan, args...)
} }