Skip to content

Commit

Permalink
Merge pull request #23 from insolar/MN-490-insolar-to-1.5.4
Browse files Browse the repository at this point in the history
MN-490: update to insolar 1.5.4; add test for check not member transfer
  • Loading branch information
megge-dream authored Jun 29, 2020
2 parents 85960da + ab390b0 commit cf4995f
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 3 deletions.
14 changes: 14 additions & 0 deletions application/functest/send_money_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import (
"github.com/insolar/insolar/applicationbase/testutils/launchnet"
"github.com/insolar/insolar/applicationbase/testutils/testrequest"
"github.com/insolar/insolar/insolar/gen"

"github.com/insolar/mainnet/application/genesisrefs"
)

const times = 5
Expand Down Expand Up @@ -283,3 +285,15 @@ func TestTransferTwoTimes(t *testing.T) {
// newFirstBalance := getBalanceNoErr(t, firstMember, firstMember.Ref)
// require.Equal(t, oldFirstBalance-2*amount, newFirstBalance)
}

func TestTransferMoneyFromNotMemberRef(t *testing.T) {
firstMember := createMember(t)
secondMember := createMember(t)
// Broke member to request object with prototype with no 'Call' method
firstMember.Ref = genesisrefs.ContractCostCenter.String()
amountStr := "10"
_, _, err := testrequest.MakeSignedRequest(launchnet.TestRPCUrlPublic, firstMember, "member.transfer",
map[string]interface{}{"amount": amountStr, "toMemberReference": secondMember.Ref})
data := checkConvertRequesterError(t, err).Data
require.Contains(t, data.Trace, "failed to find contracts method")
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.12

require (
github.com/google/gops v0.3.6
github.com/insolar/insolar v1.5.3
github.com/insolar/insolar v1.5.4
github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v0.0.5
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ github.com/insolar/insolar v1.5.1 h1:vI6P0FvDqLGe0yn3S+DjJ6PRsnvBCb9mY0z1rQg0NEI
github.com/insolar/insolar v1.5.1/go.mod h1:HvUtnqOPs4yaaLtzxOWAQbY58RWrwiIGqVyQajz24Nw=
github.com/insolar/insolar v1.5.3 h1:aj+v2JZk3TyM1U7nf+LLQlu3SJZwXJNDskNpL5n1yLg=
github.com/insolar/insolar v1.5.3/go.mod h1:HvUtnqOPs4yaaLtzxOWAQbY58RWrwiIGqVyQajz24Nw=
github.com/insolar/insolar v1.5.4 h1:1LaI3cyu3L47MWPlB+BvrAE0XYea2rf0mUH0t4xRDo8=
github.com/insolar/insolar v1.5.4/go.mod h1:HvUtnqOPs4yaaLtzxOWAQbY58RWrwiIGqVyQajz24Nw=
github.com/insolar/rpc v1.2.2-0.20200331123021-db57b8833f82 h1:SbU7YjfN6JdDP3ULyYqqgxtSOlDkFPKm6ddN4tM0bFI=
github.com/insolar/rpc v1.2.2-0.20200331123021-db57b8833f82/go.mod h1:BZcTsPtQu8QG8RqqQdAnuNAG8n6TOrdNxIHro0h99Ik=
github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6 h1:WS4a7qw+P1pcnviyxyMTA/aR+T51wJok1IC9rJkHrTg=
github.com/insolar/x-crypto v0.0.0-20191031140942-75fab8a325f6/go.mod h1:9mvKFD2wFLEGmK8pNFIowmGRTjfyn3YHtr10s7DHpBY=
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
github.com/jackc/chunkreader/v2 v2.0.0 h1:DUwgMQuuPnS0rhMXenUtZpqZqrR/30NWY+qQvTpSvEs=
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
Expand All @@ -156,6 +159,7 @@ github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye47
github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/insolar/insolar/insolar/vm.go

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

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

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ github.com/insolar/go-actors/actor/system
github.com/insolar/go-actors/actor/mailbox
# github.com/insolar/insconfig v0.0.0-20200227134411-011eca6dc866
github.com/insolar/insconfig
# github.com/insolar/insolar v1.5.3
# github.com/insolar/insolar v1.5.4
github.com/insolar/insolar/cmd/insgocc
github.com/insolar/insolar/cmd/keeperd
github.com/insolar/insolar/cmd/pulsard
Expand Down

0 comments on commit cf4995f

Please sign in to comment.