fix: rebase fix

antmat · antmat · commit 7150d6a35fa5 · 2019-01-29T13:28:07.000+03:00
diff --git a/blockchain/api.go b/blockchain/api.go
@@ -391,7 +391,7 @@ func (api *BasicAPI) ContractRegistry() ContractRegistry {
 	return api.contractRegistry
 }
 
-func NewRegistry(ctx context.Context, address common.Address, opts *chainOpts) (*BasicContractRegistry, error) {
+func NewRegistry(ctx context.Context, version uint, address common.Address, opts *chainOpts) (*BasicContractRegistry, error) {
 	client, err := opts.getClient()
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func (api *BasicAPI) ContractRegistry() ContractRegistry {`
`391`	`391`	`return api.contractRegistry`
`392`	`392`	`}`
`393`	`393`
`394`		`-func NewRegistry(ctx context.Context, address common.Address, opts chainOpts) (BasicContractRegistry, error) {`
	`394`	`+func NewRegistry(ctx context.Context, version uint, address common.Address, opts chainOpts) (BasicContractRegistry, error) {`
`395`	`395`	`client, err := opts.getClient()`
`396`	`396`	`if err != nil {`
`397`	`397`	`return nil, err`