Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/refactor zboxcore #1099

Open
wants to merge 108 commits into
base: sprint-1.18
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
f2060d9
go mod tidy
Jayashsatolia403 Mar 10, 2024
da47b3c
Restricted blobber tests
Jayashsatolia403 Mar 20, 2024
a9422df
Changed repo snapshots
Jayashsatolia403 Mar 20, 2024
27ac46f
Merge branch 'master' into sprint-1.14
Jayashsatolia403 Mar 26, 2024
e0994b0
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
d21f717
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
803ba50
Skipped authorizer tests
Jayashsatolia403 Apr 2, 2024
49f095b
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 2, 2024
f1cbede
add owner api calls (#1047)
Sanchit011 Apr 7, 2024
444f542
Added feature blobber auth tests
Jayashsatolia403 Apr 8, 2024
6a6e660
Fix API tests create allocation
Jayashsatolia403 Apr 8, 2024
4a99711
Updated gosdk
Jayashsatolia403 Apr 8, 2024
37d9664
Merge branch 'refs/heads/sprint-1.14' into feature/blobber-auth
Jayashsatolia403 Apr 8, 2024
90f92ec
Updated gosdk
Jayashsatolia403 Apr 8, 2024
3990f94
Fix
Jayashsatolia403 Apr 8, 2024
32f1bc1
Fix
Jayashsatolia403 Apr 8, 2024
eff1e13
Fix blobber config update test =
Jayashsatolia403 Apr 8, 2024
48f7f65
Fix blobber config update cleanup
Jayashsatolia403 Apr 8, 2024
ff1b743
Fix
Jayashsatolia403 Apr 8, 2024
d5cb623
Hotfix/0box (#1049)
Sanchit011 Apr 9, 2024
b114d8e
Updated gosdk
Jayashsatolia403 Apr 11, 2024
c0218cd
fix commit err message (#1052)
Hitenjain14 Apr 11, 2024
274393e
Fix
Jayashsatolia403 Apr 14, 2024
5d494ef
Fix
Jayashsatolia403 Apr 14, 2024
f7d76d8
Fix
Jayashsatolia403 Apr 14, 2024
03b3e24
Fix
Jayashsatolia403 Apr 14, 2024
f557e07
Fix
Jayashsatolia403 Apr 14, 2024
5906a73
Fix
Jayashsatolia403 Apr 14, 2024
c4b29b2
Fix lint
Jayashsatolia403 Apr 14, 2024
67ae7ee
Fix
Jayashsatolia403 Apr 14, 2024
cd10097
Merge pull request #1031 from 0chain/feature/blobber-auth
dabasov Apr 14, 2024
619a423
tests to list stakable providers (#1036)
storybehind Apr 15, 2024
43f0884
Fix 0box tests with create allocation
Jayashsatolia403 Apr 15, 2024
069c96a
fix 0box tests
Sanchit011 Apr 15, 2024
9ba204a
Empty commit
Jayashsatolia403 Apr 16, 2024
1e20724
Fix restricted blobber tests
Jayashsatolia403 Apr 16, 2024
be7287d
Merge pull request #1054 from 0chain/fix/0box-tests
dabasov Apr 16, 2024
6a49c1d
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
11a6f88
Merge branch 'master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
a455567
Merge branch 'refs/heads/master' into sprint-1.14
Jayashsatolia403 Apr 22, 2024
ca51ad2
Update gosdk
Jayashsatolia403 Apr 23, 2024
b57c34f
Fix sharder config update
Jayashsatolia403 Apr 24, 2024
c826906
fix delete wallet (#1057)
Sanchit011 Apr 27, 2024
a64f648
Fixed file format and restricted blobbers test
Jayashsatolia403 Apr 28, 2024
055f288
Fix resume upload
Jayashsatolia403 Apr 28, 2024
6f8e983
Fix restricted blobbers
Jayashsatolia403 Apr 28, 2024
763c02c
fix resume download test (#1058)
Hitenjain14 Apr 28, 2024
22c07a9
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
6581305
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
df4597d
Fix restricted blobbers
Jayashsatolia403 Apr 29, 2024
15d8c16
added repair allocation with diff file size (#1034)
Zorro30 Apr 30, 2024
2772ccc
added test suite for dropbox
pewssh May 1, 2024
967e5cf
test suite for gdrive
pewssh May 1, 2024
3dba307
updated for workflow
pewssh May 2, 2024
a17b590
lint fix
pewssh May 2, 2024
acc5176
changes for dropbox tests
pewssh May 5, 2024
66cdcd6
Fix: Issue previous test cases
pewssh May 5, 2024
fe1aeb9
Added lib
pewssh Jun 13, 2024
3a32014
Resolve conflicts
pewssh Jun 13, 2024
4a7553e
disable lint
pewssh Jun 13, 2024
27cea92
Test for mc and zs3server
pewssh Jun 21, 2024
f5aa94d
* Test cases for mc commands and warp benchmarking tool
pewssh Jul 4, 2024
b7df8ac
Test Cases Formatted
pewssh Jul 4, 2024
5d2a5b7
updated comment
pewssh Jul 4, 2024
539c50a
Added changes
pewssh Jul 12, 2024
bf4c2d9
pulled changes from 1.17
pewssh Jul 12, 2024
50ed4a5
updated readme
pewssh Jul 12, 2024
e9e6710
Added binary for mc
pewssh Jul 13, 2024
7e6e507
re
pewssh Jul 13, 2024
288ff1f
updated for mc
pewssh Jul 13, 2024
08c66be
Warp
pewssh Jul 14, 2024
061cac1
Added minio
pewssh Jul 14, 2024
479041a
Updated for mc_wrap_test_cases
pewssh Jul 14, 2024
d74313b
updated dir config
pewssh Jul 15, 2024
3285503
lint fix
pewssh Jul 15, 2024
93bf3e7
updated cli
pewssh Jul 15, 2024
1527ce8
Fix failing testcases for PR #1043 (#1077)
yash10019coder Jul 15, 2024
d780dca
main_test.go
pewssh Jul 15, 2024
280bfcc
Reset location for cli
pewssh Jul 16, 2024
437a1a4
Common server
pewssh Jul 16, 2024
0d5d9c2
Merge pull request #1088 from 0chain/mc_warp_test_cases
pewssh Jul 16, 2024
d00d61f
Revert "Mc warp test cases"
pewssh Jul 16, 2024
60b89f5
Merge pull request #1089 from 0chain/revert-1088-mc_warp_test_cases
pewssh Jul 16, 2024
80d9090
Merge branch 'master' into sprint-1.17
Jayashsatolia403 Jul 17, 2024
9420e34
Merge branch 'master' into sprint-1.17
Jayashsatolia403 Jul 17, 2024
3516323
running rollback allocation tests parallel. (#1096)
yash10019coder Jul 25, 2024
fb506c9
Fix system tests
Jayashsatolia403 Aug 25, 2024
3db0333
Revert "Fix system tests"
Jayashsatolia403 Aug 25, 2024
76c8746
Empty commit
Jayashsatolia403 Aug 25, 2024
cabebb9
Merge branch 'sprint-1.17' into fix/refactor-zboxcore
Jayashsatolia403 Aug 25, 2024
2a407e8
Revert "Revert "Fix system tests""
Jayashsatolia403 Aug 25, 2024
f8f9146
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 7, 2024
ab4dfeb
Fix
Jayashsatolia403 Sep 7, 2024
41a8a79
Fix
Jayashsatolia403 Sep 7, 2024
eec2c4c
Fix
Jayashsatolia403 Sep 14, 2024
d94a839
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 14, 2024
3b9e9af
Merge branch 'sprint-1.18' into fix/refactor-zboxcore
Jayashsatolia403 Sep 15, 2024
e050fae
Fix
Jayashsatolia403 Sep 15, 2024
2ddc1fb
Remove read marker tests
Jayashsatolia403 Sep 15, 2024
25c8be4
Cleanup/readpool refactor zboxcore (#1106)
Jayashsatolia403 Sep 23, 2024
07912ed
Fix
Jayashsatolia403 Sep 23, 2024
41f4cdb
Fix
Jayashsatolia403 Sep 23, 2024
c75f719
Fix
Jayashsatolia403 Sep 23, 2024
896be12
Fix
Jayashsatolia403 Sep 23, 2024
9915b71
Update gosdk
Jayashsatolia403 Sep 23, 2024
7e9d282
Fix
Jayashsatolia403 Sep 28, 2024
a657f97
Merge remote-tracking branch 'origin/fix/refactor-zboxcore' into fix/…
Jayashsatolia403 Sep 28, 2024
df4b11e
Fix
Jayashsatolia403 Sep 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/0chain/system_test

go 1.21
go 1.22.0

toolchain go1.22.1

require (
github.com/0chain/errors v1.0.3
github.com/0chain/gosdk v1.17.5
github.com/0chain/gosdk v1.17.10-0.20240923222008-b2d955f34e9e
github.com/go-resty/resty/v2 v2.7.0
github.com/herumi/bls-go-binary v1.31.0
github.com/shopspring/decimal v1.3.1
Expand All @@ -15,20 +15,21 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tyler-smith/go-bip39 v1.1.0
github.com/ybbus/jsonrpc/v3 v3.1.5 // nolint
golang.org/x/crypto v0.24.0
golang.org/x/crypto v0.27.0
gopkg.in/errgo.v2 v2.1.0
gopkg.in/yaml.v3 v3.0.1
gorm.io/gorm v1.24.1
)

require (
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hack-pad/go-webworkers v0.1.0 // indirect
github.com/hack-pad/safejs v0.1.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 // indirect
github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
Expand Down Expand Up @@ -101,10 +102,10 @@ require (
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.dedis.ch/fixbuf v1.0.3 // indirect
go.dedis.ch/kyber/v3 v3.1.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
38 changes: 23 additions & 15 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs
github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E=
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
github.com/0chain/gosdk v1.17.5 h1:WusXPOj+lyK9XBUY1JPjBqPmkGV4A0J6bqsRluseusg=
github.com/0chain/gosdk v1.17.5/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg=
github.com/0chain/gosdk v1.17.10-0.20240923222008-b2d955f34e9e h1:aHTGHUW2RTOgobjH0eFLZtFdw5/O7CeEmSU4me4/3go=
github.com/0chain/gosdk v1.17.10-0.20240923222008-b2d955f34e9e/go.mod h1:HLtHtTmW3KqrKSwELJurunRLrm2AeIj3k5wTE+JYzoo=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw=
Expand Down Expand Up @@ -93,7 +93,6 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
Expand Down Expand Up @@ -127,6 +126,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
Expand Down Expand Up @@ -232,6 +233,13 @@ github.com/hack-pad/safejs v0.1.1 h1:d5qPO0iQ7h2oVtpzGnLExE+Wn9AtytxIfltcS2b9KD8
github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio=
github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM=
github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0=
github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
Expand All @@ -242,8 +250,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/herumi/bls-go-binary v1.31.0 h1:L1goQ2tMtGgpXCg5AwHAdJQpLs/pfnWWEc3Wog6OhmI=
github.com/herumi/bls-go-binary v1.31.0/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y=
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 h1:Z6Mu2JCsW2hbqx91L0HNPRPQ10RyAFvPocQHlrRo1Jk=
github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk=
github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c h1:lDSIbcLu5TdT+uwb4wPzZgo1pQvKjP/tArL5QKjDJdI=
github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk=
github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8=
Expand Down Expand Up @@ -451,8 +459,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -528,8 +536,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand All @@ -550,8 +558,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down Expand Up @@ -604,8 +612,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand All @@ -622,8 +630,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
21 changes: 0 additions & 21 deletions internal/api/model/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,6 @@ func NewCreateWritePoolTransactionData(createWritePoolRequest CreateWritePoolReq
}
}

func NewCreateReadPoolTransactionData() TransactionData {
return TransactionData{
Name: "read_pool_lock",
}
}

func NewUnlockReadPoolTransactionData() TransactionData {
return TransactionData{
Name: "read_pool_unlock",
}
}

func NewCreateStackPoolTransactionData(createStakePoolRequest CreateStakePoolRequest) TransactionData {
return TransactionData{
Name: "stake_pool_lock",
Expand Down Expand Up @@ -372,10 +360,6 @@ type ClientGetBalanceResponse struct {
Nonce int64 `json:"nonce"`
}

type ClientGetReadPoolBalanceRequest struct {
ClientID string
}

type QueryRequest struct {
Query string
}
Expand All @@ -389,11 +373,6 @@ type GetAllChallengesForAllocationRequest struct {
AllocationID string
}

type ClientGetReadPoolBalanceResponse struct {
UserID string `json:"user_id" gorm:"uniqueIndex"`
Balance int64 `json:"balance"`
}

type QueryRewardsResponse struct {
TotalProviderReward float64 `json:"total_provider_reward"`
TotalDelegateReward float64 `json:"total_delegate_reward"`
Expand Down
133 changes: 0 additions & 133 deletions internal/api/util/client/api_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const (
TransactionFeeGet = "/v1/estimate_txn_fee"
TransactionGetConfirmation = "/v1/transaction/get/confirmation"
ClientGetBalance = "/v1/client/get/balance"
ClientReadPool = "/v1/screst/:sc_address/getReadPoolStat"
GetNetworkDetails = "/network"
GetFileRef = "/v1/file/refs/:allocation_id"
GetFileRefPath = "/v1/file/referencepath/:allocation_id"
Expand Down Expand Up @@ -497,24 +496,6 @@ func (c *APIClient) V1ClientGetBalance(t *test.SystemTest, clientGetBalanceReque
return clientGetBalanceResponse, resp, err
}

func (c *APIClient) V1ClientGetReadPoolBalance(t *test.SystemTest, clientGetReadBalanceRequest model.ClientGetReadPoolBalanceRequest, requiredStatusCode int) (*model.ClientGetReadPoolBalanceResponse, *resty.Response, error) { //nolint
var clientGetReadPoolBalanceResponse *model.ClientGetReadPoolBalanceResponse

urlBuilder := NewURLBuilder().SetPath(ClientReadPool).AddParams("client_id", clientGetReadBalanceRequest.ClientID).SetPathVariable("sc_address", StorageSmartContractAddress)

resp, err := c.executeForAllServiceProviders(
t,
urlBuilder,
&model.ExecutionRequest{
Dst: &clientGetReadPoolBalanceResponse,
RequiredStatusCode: requiredStatusCode,
},
HttpGETMethod,
SharderServiceProvider)

return clientGetReadPoolBalanceResponse, resp, err
}

func (c *APIClient) V1SCRestGetAllMiners(t *test.SystemTest, requiredStatusCode int) ([]*model.SCRestGetMinerSharderResponse, *resty.Response, error) {
var scRestGetMinersResponse *model.SCRestGetMinersShardersResponse

Expand Down Expand Up @@ -1310,27 +1291,6 @@ func (c *APIClient) GetWalletBalance(t *test.SystemTest, wallet *model.Wallet, r
return clientGetBalanceResponse
}

func (c *APIClient) GetReadPoolBalance(t *test.SystemTest, wallet *model.Wallet, requiredStatusCode int) *model.ClientGetReadPoolBalanceResponse {
t.Log("Get read pool balance...")

clientGetReadPoolBalanceResponse, resp, err := c.V1ClientGetReadPoolBalance(
t,
model.ClientGetReadPoolBalanceRequest{
ClientID: wallet.Id,
},
requiredStatusCode)

if err != nil {
t.Logf("Error getting readpool balance: %v", err)
return clientGetReadPoolBalanceResponse
}
require.Nil(t, err)
require.NotNil(t, resp)
require.NotNil(t, clientGetReadPoolBalanceResponse)

return clientGetReadPoolBalanceResponse
}

func (c *APIClient) GetRewardsByQuery(t *test.SystemTest, query string, requiredStatusCode int) *model.QueryRewardsResponse {
t.Log("Get rewards by query...")

Expand Down Expand Up @@ -1732,99 +1692,6 @@ func (c *APIClient) CreateWritePool(t *test.SystemTest, wallet *model.Wallet, al
return createWritePoolTransactionGetConfirmationResponse.Hash
}

// CreateReadPoolWrapper does not provide deep test of used components
func (c *APIClient) CreateReadPool(t *test.SystemTest, wallet *model.Wallet, tokens float64, requiredTransactionStatus int) string {
t.Log("Create Read pool...")

createReadPoolTransactionPutResponse, resp, err := c.V1TransactionPut(
t,
model.InternalTransactionPutRequest{
Wallet: wallet,
ToClientID: StorageSmartContractAddress,
TransactionData: model.NewCreateReadPoolTransactionData(),
Value: tokenomics.IntToZCN(tokens),
TxnType: SCTxType,
},
HttpOkStatus)
require.Nil(t, err)
require.NotNil(t, resp)
require.NotNil(t, createReadPoolTransactionPutResponse)

var createReadPoolTransactionGetConfirmationResponse *model.TransactionGetConfirmationResponse

wait.PoolImmediately(t, time.Minute*2, func() bool {
createReadPoolTransactionGetConfirmationResponse, resp, err = c.V1TransactionGetConfirmation(
t,
model.TransactionGetConfirmationRequest{
Hash: createReadPoolTransactionPutResponse.Entity.Hash,
},
HttpOkStatus)
if err != nil {
return false
}

if resp == nil {
return false
}

if createReadPoolTransactionGetConfirmationResponse == nil {
return false
}

return createReadPoolTransactionGetConfirmationResponse.Status == requiredTransactionStatus
})

wallet.IncNonce()

return createReadPoolTransactionGetConfirmationResponse.Hash
}

func (c *APIClient) UnlockReadPool(t *test.SystemTest, wallet *model.Wallet, requiredTransactionStatus int) string {
t.Log("Unlock Read pool...")

unlockReadPoolTransactionPutResponse, resp, err := c.V1TransactionPut(
t,
model.InternalTransactionPutRequest{
Wallet: wallet,
ToClientID: StorageSmartContractAddress,
TransactionData: model.NewUnlockReadPoolTransactionData(),
Value: tokenomics.IntToZCN(0.1),
TxnType: SCTxType,
},
HttpOkStatus)
require.Nil(t, err)
require.NotNil(t, resp)
require.NotNil(t, unlockReadPoolTransactionPutResponse)

var unlockReadPoolTransactionGetConfirmationResponse *model.TransactionGetConfirmationResponse

wait.PoolImmediately(t, time.Minute*2, func() bool {
unlockReadPoolTransactionGetConfirmationResponse, resp, err = c.V1TransactionGetConfirmation(
t,
model.TransactionGetConfirmationRequest{
Hash: unlockReadPoolTransactionPutResponse.Entity.Hash,
},
HttpOkStatus)
if err != nil {
return false
}

if resp == nil {
return false
}

if unlockReadPoolTransactionGetConfirmationResponse == nil {
return false
}

return unlockReadPoolTransactionGetConfirmationResponse.Status == requiredTransactionStatus
})

wallet.IncNonce()

return unlockReadPoolTransactionGetConfirmationResponse.Hash
}

func (c *APIClient) V1SCRestGetStakePoolStat(t *test.SystemTest, scRestGetStakePoolStatRequest model.SCRestGetStakePoolStatRequest, requiredStatusCode int) (*model.SCRestGetStakePoolStatResponse, *resty.Response, error) { //nolint
var scRestGetStakePoolStatResponse *model.SCRestGetStakePoolStatResponse

Expand Down
5 changes: 3 additions & 2 deletions internal/api/util/client/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package client
import (
"bytes"
"crypto/rand"
"github.com/0chain/gosdk/core/client"
"io"
"os"
"path/filepath"
Expand Down Expand Up @@ -96,13 +97,13 @@ func (c *SDKClient) SetWallet(t *test.SystemTest, wallet *model.Wallet) {
serializedWallet, err := c.wallet.String()
require.NoError(t, err, "failed to serialize wallet object", wallet)

err = sdk.InitStorageSDK(
err = client.InitSDK(
serializedWallet,
c.blockWorker,
"",
crypto.BLS0Chain,
nil,
int64(wallet.Nonce),
int64(wallet.Nonce), false, true,
)
require.NoError(t, err, ErrInitStorageSDK)
}
Expand Down
Loading
Loading