Skip to content

Commit c7bb5ef

Browse files
bjartekbjartek
authored
added createTestUsers and updated deps (#173)
* added createTestUsers and updated deps * update to newest flowkit * update deps
1 parent e949fd0 commit c7bb5ef

File tree

5 files changed

+78
-27
lines changed

5 files changed

+78
-27
lines changed

‎doc_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func ExampleOverflowState_Tx() {
3333
//🧑 Created account: emulator-first with address: 179b6b1cb6755e31 with flow: 10.00
3434
//🧑 Created account: emulator-second with address: f3fcd2c1a78f5eee with flow: 10.00
3535
//📜 deploy contracts Debug
36-
//👌 Tx:arguments fee:0.00001000 gas:18
36+
//👌 Tx:arguments fee:0.00001000 gas:21
3737
//
3838
}
3939

@@ -55,7 +55,7 @@ func ExampleOverflowState_Tx_inline() {
5555
//🧑 Created account: emulator-first with address: 179b6b1cb6755e31 with flow: 10.00
5656
//🧑 Created account: emulator-second with address: f3fcd2c1a78f5eee with flow: 10.00
5757
//📜 deploy contracts Debug
58-
//👌 Tx: fee:0.00001000 gas:27
58+
//👌 Tx: fee:0.00001000 gas:35
5959
//=== Events ===
6060
//A.f8d6e0586b0a20c7.Debug.Log
6161
// msg -> overflow ftw!
@@ -81,7 +81,7 @@ func ExampleOverflowState_Tx_multisign() {
8181
//🧑 Created account: emulator-first with address: 179b6b1cb6755e31 with flow: 10.00
8282
//🧑 Created account: emulator-second with address: f3fcd2c1a78f5eee with flow: 10.00
8383
//📜 deploy contracts Debug
84-
//👌 Tx: fee:0.00001000 gas:29
84+
//👌 Tx: fee:0.00001000 gas:36
8585
//=== Events ===
8686
//A.f8d6e0586b0a20c7.Debug.Log
8787
// msg -> acct:0xf3fcd2c1a78f5eee

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ toolchain go1.22.3
66

77
require (
88
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
9-
github.com/bjartek/underflow v1.7.0
9+
github.com/bjartek/underflow v1.8.0
1010
github.com/enescakir/emoji v1.0.0
1111
github.com/fatih/color v1.16.0
1212
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
1313
github.com/hashicorp/go-multierror v1.1.1
1414
github.com/hexops/autogold v1.3.1
15-
github.com/onflow/cadence v1.0.0-preview.39
15+
github.com/onflow/cadence v1.0.0-preview.48
1616
github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.18
17-
github.com/onflow/flow-emulator v1.0.0-preview.36
18-
github.com/onflow/flow-go v0.36.4-0.20240724205438-14f9fddeda2b
19-
github.com/onflow/flow-go-sdk v1.0.0-preview.42
20-
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.27
17+
github.com/onflow/flow-emulator v1.0.0-preview.39
18+
github.com/onflow/flow-go v0.37.1
19+
github.com/onflow/flow-go-sdk v1.0.0-preview.50
20+
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.30
2121
github.com/pkg/errors v0.9.1
2222
github.com/rs/zerolog v1.29.1
2323
github.com/sanity-io/litter v1.5.5
@@ -161,7 +161,7 @@ require (
161161
github.com/multiformats/go-varint v0.0.7 // indirect
162162
github.com/nightlyone/lockfile v1.0.0 // indirect
163163
github.com/olekukonko/tablewriter v0.0.5 // indirect
164-
github.com/onflow/atree v0.7.0-rc.2 // indirect
164+
github.com/onflow/atree v0.8.0-rc.5 // indirect
165165
github.com/onflow/crypto v0.25.1 // indirect
166166
github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 // indirect
167167
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 // indirect
@@ -243,7 +243,7 @@ require (
243243
google.golang.org/protobuf v1.33.0 // indirect
244244
gopkg.in/ini.v1 v1.67.0 // indirect
245245
gopkg.in/yaml.v3 v3.0.1 // indirect
246-
lukechampine.com/blake3 v1.2.1 // indirect
246+
lukechampine.com/blake3 v1.3.0 // indirect
247247
modernc.org/libc v1.37.6 // indirect
248248
modernc.org/mathutil v1.6.0 // indirect
249249
modernc.org/memory v1.7.2 // indirect

‎go.sum

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,8 +1074,8 @@ github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edY
10741074
github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
10751075
github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88=
10761076
github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
1077-
github.com/bjartek/underflow v1.7.0 h1:9B3m+IpAX5j9f5n8FlkxnwsSgvsnkdhzYlusNdQYSHY=
1078-
github.com/bjartek/underflow v1.7.0/go.mod h1:3dujqcYAOma8r05PZW9qBoHNnHpcb4fWRbNX0181YN4=
1077+
github.com/bjartek/underflow v1.8.0 h1:l4Us9RoTgAaM2TZVc7GHSGQizaYQzTNCD4T39KKhP9U=
1078+
github.com/bjartek/underflow v1.8.0/go.mod h1:dru+wx1KRuaVV3gHm30BxibT0gRwZkuh9E/i+T26KIc=
10791079
github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
10801080
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
10811081
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
@@ -1965,11 +1965,11 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
19651965
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
19661966
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
19671967
github.com/onflow/atree v0.6.1-0.20230711151834-86040b30171f/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM=
1968-
github.com/onflow/atree v0.7.0-rc.2 h1:mZmVrl/zPlfI44EjV3FdR2QwIqT8nz1sCONUBFcML/U=
1969-
github.com/onflow/atree v0.7.0-rc.2/go.mod h1:xvP61FoOs95K7IYdIYRnNcYQGf4nbF/uuJ0tHf4DRuM=
1968+
github.com/onflow/atree v0.8.0-rc.5 h1:1sU+c6UfDzq/EjM8nTw4EI8GvEMarcxkWkJKy6piFSY=
1969+
github.com/onflow/atree v0.8.0-rc.5/go.mod h1:yccR+LR7xc1Jdic0mrjocbHvUD7lnVvg8/Ct1AA5zBo=
19701970
github.com/onflow/cadence v1.0.0-M3/go.mod h1:odXGZZ/wGNA5mwT8bC9v8u8EXACHllB2ABSZK65TGL8=
1971-
github.com/onflow/cadence v1.0.0-preview.39 h1:BDx+hO4THUW6cDN11tqVtBx8hFSUErjQkw/WDAGs0C4=
1972-
github.com/onflow/cadence v1.0.0-preview.39/go.mod h1:jOwvPSSLTr9TvaKMs7KKiBYMmpdpNNAFxBsjMlrqVD0=
1971+
github.com/onflow/cadence v1.0.0-preview.48 h1:WkgU0z6H/oRe44kLL6OO+wkGeKULWChoCT8i7sgiWdg=
1972+
github.com/onflow/cadence v1.0.0-preview.48/go.mod h1:BCoenp1TYp+SmG7FGWStjehvvzcvNQ3xvpK5rkthq3Y=
19731973
github.com/onflow/crypto v0.25.0/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
19741974
github.com/onflow/crypto v0.25.1 h1:0txy2PKPMM873JbpxQNbJmuOJtD56bfs48RQfm0ts5A=
19751975
github.com/onflow/crypto v0.25.1/go.mod h1:C8FbaX0x8y+FxWjbkHy0Q4EASCDR9bSPWZqlpCLYyVI=
@@ -1979,26 +1979,26 @@ github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1 h1:q9tXLIALwQ76bO4
19791979
github.com/onflow/flow-core-contracts/lib/go/contracts v1.3.1/go.mod h1:u/mkP/B+PbV33tEG3qfkhhBlydSvAKxfLZSfB4lsJHg=
19801980
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1 h1:FfhMBAb78p6VAWkJ+iqdKLErGQVQgxk5w6DP5ZruWX8=
19811981
github.com/onflow/flow-core-contracts/lib/go/templates v1.3.1/go.mod h1:NgbMOYnMh0GN48VsNKZuiwK7uyk38Wyo8jN9+C9QE30=
1982-
github.com/onflow/flow-emulator v1.0.0-preview.36 h1:XCBWo6XNcnejxw17Qz8lmHW1fzwzApbrm4nxWp09yt4=
1983-
github.com/onflow/flow-emulator v1.0.0-preview.36/go.mod h1:ngGgic4WYQzlW7esXgGQOpm1Berfar6q+z3qbDQ8ay8=
1982+
github.com/onflow/flow-emulator v1.0.0-preview.39 h1:5z/jKUrU3YB/Lqvr1bNTDW2BGIcCJocLdw06Rk87r+U=
1983+
github.com/onflow/flow-emulator v1.0.0-preview.39/go.mod h1:0mXSq9eSwkAmGgvn/8aCBNgXiJM6MHKETFgPSk6f9NA=
19841984
github.com/onflow/flow-ft/lib/go/contracts v1.0.0 h1:mToacZ5NWqtlWwk/7RgIl/jeKB/Sy/tIXdw90yKHcV0=
19851985
github.com/onflow/flow-ft/lib/go/contracts v1.0.0/go.mod h1:PwsL8fC81cjnUnTfmyL/HOIyHnyaw/JA474Wfj2tl6A=
19861986
github.com/onflow/flow-ft/lib/go/templates v1.0.0 h1:6cMS/lUJJ17HjKBfMO/eh0GGvnpElPgBXx7h5aoWJhs=
19871987
github.com/onflow/flow-ft/lib/go/templates v1.0.0/go.mod h1:uQ8XFqmMK2jxyBSVrmyuwdWjTEb+6zGjRYotfDJ5pAE=
1988-
github.com/onflow/flow-go v0.36.4-0.20240724205438-14f9fddeda2b h1:hgna3jsW/w9WcY7I5P19pU9882iCm2BM2nJMY3SDyRE=
1989-
github.com/onflow/flow-go v0.36.4-0.20240724205438-14f9fddeda2b/go.mod h1:OGWZcM13nXoqBF3nyv5en/NVtBN9e5zJe4eLV1dzXSE=
1988+
github.com/onflow/flow-go v0.37.1 h1:DHvadojDigTOjLBLrwwKyyWXVRawmlefAk/DNVbK8cQ=
1989+
github.com/onflow/flow-go v0.37.1/go.mod h1:hLFem+cwkq6650p4+0DUp36GH2QEuuFDCDUzDg0QZNE=
19901990
github.com/onflow/flow-go-sdk v1.0.0-M1/go.mod h1:TDW0MNuCs4SvqYRUzkbRnRmHQL1h4X8wURsCw9P9beo=
1991-
github.com/onflow/flow-go-sdk v1.0.0-preview.42 h1:XcHWRQfkJ5A24sNqnmo3DocHdf5ulDJLie9/yh5c1Y4=
1992-
github.com/onflow/flow-go-sdk v1.0.0-preview.42/go.mod h1:4/ELH5ooEdZ+9tZfoiTIkkB4B6wVgy4HbMjS/9w/67Q=
1991+
github.com/onflow/flow-go-sdk v1.0.0-preview.50 h1:j5HotrV/ieo5JckmMxR2dMxO3x1j7YO8SP2EuGMEwRQ=
1992+
github.com/onflow/flow-go-sdk v1.0.0-preview.50/go.mod h1:Ykk4PS7fgWuc6BB073tdzHu/VtzOd0CVNIoDjaqFHLg=
19931993
github.com/onflow/flow-nft/lib/go/contracts v1.2.1 h1:woAAS5z651sDpi7ihAHll8NvRS9uFXIXkL6xR+bKFZY=
19941994
github.com/onflow/flow-nft/lib/go/contracts v1.2.1/go.mod h1:2gpbza+uzs1k7x31hkpBPlggIRkI53Suo0n2AyA2HcE=
19951995
github.com/onflow/flow-nft/lib/go/templates v1.2.0 h1:JSQyh9rg0RC+D1930BiRXN8lrtMs+ubVMK6aQPon6Yc=
19961996
github.com/onflow/flow-nft/lib/go/templates v1.2.0/go.mod h1:p+2hRvtjLUR3MW1NsoJe5Gqgr2eeH49QB6+s6ze00w0=
19971997
github.com/onflow/flow/protobuf/go/flow v0.3.2-0.20231121210617-52ee94b830c2/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
19981998
github.com/onflow/flow/protobuf/go/flow v0.4.5 h1:6o+pgYGqwXdEhqSJxu2BdnDXkOQVOkfGAb6IiXB+NPM=
19991999
github.com/onflow/flow/protobuf/go/flow v0.4.5/go.mod h1:NA2pX2nw8zuaxfKphhKsk00kWLwfd+tv8mS23YXO4Sk=
2000-
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.27 h1:3OhMqkXAgi4n8caM86rp+PqpvYufrcreuXw5k7PQIGs=
2001-
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.27/go.mod h1:yoH9656uDqoh+PQJCsxPeSrqqWWPkmkaqabZZWfbnko=
2000+
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.30 h1:d9ghYPewpcouo6uIbcxBTsfuzDKSYITtCdaxVeDQ/bw=
2001+
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.30/go.mod h1:6GwkwNKorzFMqXxOaFHk2SypMe/kajEoo8UnoJDWD2U=
20022002
github.com/onflow/go-ethereum v1.14.7 h1:gg3awYqI02e3AypRdpJKEvNTJ6kz/OhAqRti0h54Wlc=
20032003
github.com/onflow/go-ethereum v1.14.7/go.mod h1:zV14QLrXyYu5ucvcwHUA0r6UaqveqbXaehAVQJlSW+I=
20042004
github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
@@ -3293,8 +3293,9 @@ honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
32933293
launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54=
32943294
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
32953295
lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
3296-
lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
32973296
lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
3297+
lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
3298+
lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
32983299
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
32993300
lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
33003301
modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=

‎state.go

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ type OverflowClient interface {
9797

9898
// use this method to transform a flow transactionResult and transaction into a overflow transaction
9999
CreateOverflowTransaction(blockId string, transactionResult flow.TransactionResult, transaction flow.Transaction, txIndex int) (*OverflowTransaction, error)
100+
101+
CreateTestAccounts(ctx context.Context, num int, flowTokens float64) (map[string]*accounts.Account, error)
100102
}
101103

102104
var _ OverflowClient = (*OverflowState)(nil)
@@ -892,3 +894,51 @@ func (o *OverflowState) GetCoverageReport() *runtime.CoverageReport {
892894
func (o *OverflowState) RollbackToBlockHeight(height uint64) error {
893895
return o.EmulatorGatway.RollbackToBlockHeight(height)
894896
}
897+
898+
// this methods create test accounts that can be used in WithManualSigner, they are not in flow json
899+
func (o *OverflowState) CreateTestAccounts(ctx context.Context, num int, flowTokens float64) (map[string]*accounts.Account, error) {
900+
account, err := o.AccountE("account")
901+
if err != nil {
902+
return nil, err
903+
}
904+
905+
pk, err := account.Key.PrivateKey()
906+
if err != nil {
907+
return nil, err
908+
}
909+
pki := *pk
910+
911+
accountKey := accounts.NewHexKeyFromPrivateKey(0, account.Key.HashAlgo(), pki)
912+
users := map[string]*accounts.Account{}
913+
914+
keys := []accounts.PublicKey{{
915+
Public: pki.PublicKey(),
916+
Weight: 1000,
917+
SigAlgo: account.Key.SigAlgo(),
918+
HashAlgo: account.Key.HashAlgo(),
919+
}}
920+
921+
for i := 0; i < num; i++ {
922+
userAccount, _, err := o.Flowkit.CreateAccount(ctx, account, keys)
923+
if err != nil {
924+
return nil, err
925+
}
926+
927+
address := userAccount.Address.Hex()
928+
if flowTokens > 0.0 {
929+
result := o.MintFlowTokens(address, flowTokens)
930+
if result.Error != nil {
931+
return nil, result.Error
932+
}
933+
}
934+
935+
a := &accounts.Account{
936+
Name: fmt.Sprintf("user-%d", i),
937+
Address: userAccount.Address,
938+
Key: accountKey,
939+
}
940+
941+
users[userAccount.Address.Hex()] = a
942+
}
943+
return users, nil
944+
}

‎transaction_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ func TestFillUpSpace(t *testing.T) {
411411
o, err := OverflowTesting(WithFlowForNewUsers(0.001))
412412
assert.NoError(t, err)
413413
result := o.GetFreeCapacity("first")
414-
assert.Equal(t, 198857, result)
414+
assert.Equal(t, 198993, result)
415415
o.FillUpStorage("first")
416416
assert.NoError(t, o.Error)
417417

0 commit comments

Comments
 (0)