Skip to content

Commit

Permalink
centrefigure to mailchain
Browse files Browse the repository at this point in the history
  • Loading branch information
@robdefeo
robdefeo committed Jul 11, 2020
1 parent e3ff1f7 commit cdd7abc
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 30 deletions.
2 changes: 1 addition & 1 deletion cmd/indexer/internal/substrate/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/indexer/internal/substrate/block_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package substrate
import (
"context"

gsrpc "github.com/centrifuge/go-substrate-rpc-client"
gsrpc "github.com/mailchain/go-substrate-rpc-client"
)

func NewRPC(address string) (*BlockClient, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/indexer/internal/substrate/block_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"testing"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/golang/mock/gomock"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
"github.com/mailchain/mailchain/cmd/indexer/internal/actions/actionstest"
"github.com/mailchain/mailchain/cmd/indexer/internal/substrate"
Expand Down
2 changes: 1 addition & 1 deletion cmd/indexer/internal/substrate/data_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io/ioutil"
"testing"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/indexer/internal/substrate/extrinsic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"context"

"github.com/centrifuge/go-substrate-rpc-client/scale"
"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mailchain/go-substrate-rpc-client/scale"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
"github.com/mailchain/mailchain/cmd/internal/datastore"
"github.com/mailchain/mailchain/crypto"
Expand Down Expand Up @@ -36,7 +36,7 @@ func NewExtrinsicProcessor(store datastore.TransactionStore, rawStore datastore.
func (t *Extrinsic) Run(ctx context.Context, protocol, network string, tx interface{}, txOpts actions.TransactionOptions) error {
subEx, ok := tx.(*types.Extrinsic)
if !ok {
return errors.Errorf("tx must be github.com/centrifuge/go-substrate-rpc-client/types.Extrinsic")
return errors.Errorf("tx must be github.com/mailchain/go-substrate-rpc-client/types.Extrinsic")
}

opts, ok := txOpts.(*TxOptions)
Expand Down
2 changes: 1 addition & 1 deletion cmd/indexer/internal/substrate/extrinsic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"testing"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/golang/mock/gomock"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/cmd/indexer/internal/actions"
"github.com/mailchain/mailchain/cmd/indexer/internal/substrate"
"github.com/mailchain/mailchain/cmd/internal/datastore"
Expand Down
11 changes: 6 additions & 5 deletions cmd/mailchain/internal/settings/substraterpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ package settings

import (
"fmt"
"github.com/centrifuge/go-substrate-rpc-client/types"
"net/http"
"net/http/httptest"
"reflect"
"testing"

"github.com/golang/mock/gomock"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/cmd/internal/settings/values"
"github.com/mailchain/mailchain/cmd/internal/settings/values/valuestest"
"github.com/mailchain/mailchain/internal/protocols/substrate"
"github.com/stretchr/testify/assert"
"net/http"
"net/http/httptest"
"reflect"
"testing"
)

func Test_substrateRPCSender(t *testing.T) {
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ require (
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412
github.com/andreburgaud/crypt2go v0.11.0
github.com/aws/aws-sdk-go v1.33.1
github.com/centrifuge/go-substrate-rpc-client v0.0.0-20200416153336-03ce7c572bf0
github.com/centrifuge/go-substrate-rpc-client v1.1.0 // indirect

github.com/dgraph-io/badger/v2 v2.0.3
github.com/ethereum/go-ethereum v1.9.15
github.com/golang/mock v1.4.3
Expand All @@ -20,6 +21,7 @@ require (
github.com/ipfs/go-cid v0.0.6
github.com/jmoiron/sqlx v1.2.0
github.com/lib/pq v1.7.0
github.com/mailchain/go-substrate-rpc-client v1.1.1-0.20200711220547-b44a964b0cd8
github.com/manifoldco/promptui v0.7.0
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
github.com/mitchellh/go-homedir v1.1.0
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46f
github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/centrifuge/go-substrate-rpc-client v0.0.0-20200416153336-03ce7c572bf0 h1:vcOTEHMOA/q1vwBgm2/RTBRbsWihrey2VKyk/lrompU=
github.com/centrifuge/go-substrate-rpc-client v0.0.0-20200416153336-03ce7c572bf0/go.mod h1:GBMLH8MQs5g4FcrytcMm9uRgBnTL1LIkNTue6lUPhZU=
github.com/centrifuge/go-substrate-rpc-client v1.1.0 h1:cpfG7KKwy+n7FRb1LkiMYwi6e4gwzaooGfPIzXXQj6w=
github.com/centrifuge/go-substrate-rpc-client v1.1.0/go.mod h1:GBMLH8MQs5g4FcrytcMm9uRgBnTL1LIkNTue6lUPhZU=
github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU=
github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
Expand Down Expand Up @@ -385,6 +385,8 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailchain/go-substrate-rpc-client v1.1.1-0.20200711220547-b44a964b0cd8 h1:z1b8PQlq+33dhtzqGHloRVajJh3An86NNScANXNfMa0=
github.com/mailchain/go-substrate-rpc-client v1.1.1-0.20200711220547-b44a964b0cd8/go.mod h1:zG3jhxnu6XMKMc2BlulU8WJ2rO6HEXFM8x4iD5iDngE=
github.com/manifoldco/promptui v0.7.0 h1:3l11YT8tm9MnwGFQ4kETwkzpAwY2Jt9lCrumCUW4+z4=
github.com/manifoldco/promptui v0.7.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/substrate/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package substrate

import (
"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/crypto"
"github.com/mailchain/mailchain/crypto/ed25519"
"github.com/mailchain/mailchain/crypto/sr25519"
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/substrate/signer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"errors"
"testing"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/golang/mock/gomock"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/crypto"
"github.com/mailchain/mailchain/crypto/cryptotest"
"github.com/mailchain/mailchain/crypto/ed25519/ed25519test"
Expand Down
4 changes: 2 additions & 2 deletions sender/substraterpc/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"math/big"

gsrpc "github.com/centrifuge/go-substrate-rpc-client"
"github.com/centrifuge/go-substrate-rpc-client/types"
gsrpc "github.com/mailchain/go-substrate-rpc-client"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/encoding"
"github.com/mailchain/mailchain/internal/protocols/substrate"
)
Expand Down
7 changes: 4 additions & 3 deletions sender/substraterpc/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import (
"context"
"errors"
"fmt"
"github.com/mr-tron/base58/base58"
"math/big"
"net/http"
"net/http/httptest"
"testing"

gsrpc "github.com/centrifuge/go-substrate-rpc-client"
"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mr-tron/base58/base58"

gsrpc "github.com/mailchain/go-substrate-rpc-client"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/crypto/sr25519/sr25519test"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion sender/substraterpc/sender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/centrifuge/go-substrate-rpc-client/types"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/internal/mailbox/signer"
"github.com/mailchain/mailchain/internal/protocols"
"github.com/mailchain/mailchain/internal/protocols/substrate"
Expand Down
7 changes: 4 additions & 3 deletions sender/substraterpc/sender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ package substraterpc
import (
"context"

"github.com/centrifuge/go-substrate-rpc-client/types"
"math/big"
"testing"

"github.com/golang/mock/gomock"
"github.com/mailchain/go-substrate-rpc-client/types"
"github.com/mailchain/mailchain/encoding/encodingtest"
"github.com/mailchain/mailchain/internal/mailbox/signer"
"github.com/mailchain/mailchain/internal/mailbox/signer/signertest"
Expand All @@ -13,8 +16,6 @@ import (
"github.com/mailchain/mailchain/sender"
"github.com/mailchain/mailchain/sender/substraterpc/substraterpctest"
"github.com/pkg/errors"
"math/big"
"testing"
)

func TestSubstrateRPC_Send(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sender/substraterpc/substraterpc.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package substraterpc

import (
gsrpc "github.com/centrifuge/go-substrate-rpc-client"
gsrpc "github.com/mailchain/go-substrate-rpc-client"
)

func New(address string) (*SubstrateRPC, error) {
Expand Down
3 changes: 2 additions & 1 deletion sender/substraterpc/substraterpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package substraterpc

import (
"fmt"
"github.com/centrifuge/go-substrate-rpc-client/types"
"net/http"
"net/http/httptest"
"testing"

"github.com/mailchain/go-substrate-rpc-client/types"
)

func TestNew(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion sender/substraterpc/substraterpctest/client_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cdd7abc

Please sign in to comment.