forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-28 07:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update converted v1 bind test cases. rename test case that checks converted-v1 bindings in v2 to something more sensible

Browse source
This commit is contained in:
Jared Wasinger 2025-01-06 18:55:28 +07:00 committed by Felix Lange
parent 8ea9929a30
commit 64c13eb2b9
11 changed files with 91 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
accounts/abi/bind/bindv2_test.go
View file

@ -329,7 +329,7 @@ var bindTests2 = []bindV2Test{
},
}
func TestBindingV2(t *testing.T) {
func TestBindingV2ConvertedV1Tests(t *testing.T) {
os.Mkdir("convertedv1bindtests", 0777)
for _, tc := range bindTests2 {
t.Run(tc.name, func(t *testing.T) {

19
accounts/abi/bind/v2/internal/convertedv1bindtests/crowdsale.go
View file

@ -61,10 +61,10 @@ func (_Crowdsale *Crowdsale) UnpackAmountRaised(data []byte) (*big.Int, error) {
out, err := _Crowdsale.abi.Unpack("amountRaised", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -108,10 +108,10 @@ func (_Crowdsale *Crowdsale) UnpackDeadline(data []byte) (*big.Int, error) {
out, err := _Crowdsale.abi.Unpack("deadline", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -138,7 +138,8 @@ func (_Crowdsale *Crowdsale) UnpackFunders(data []byte) (FundersOutput, error) {
}
outstruct.Addr = *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
outstruct.Amount = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Amount = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -155,10 +156,10 @@ func (_Crowdsale *Crowdsale) UnpackFundingGoal(data []byte) (*big.Int, error) {
out, err := _Crowdsale.abi.Unpack("fundingGoal", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -175,10 +176,10 @@ func (_Crowdsale *Crowdsale) UnpackPrice(data []byte) (*big.Int, error) {
out, err := _Crowdsale.abi.Unpack("price", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err

53
accounts/abi/bind/v2/internal/convertedv1bindtests/dao.go
View file

@ -95,10 +95,10 @@ func (_DAO *DAO) UnpackDebatingPeriodInMinutes(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("debatingPeriodInMinutes", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -115,10 +115,10 @@ func (_DAO *DAO) UnpackExecuteProposal(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("executeProposal", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -135,10 +135,10 @@ func (_DAO *DAO) UnpackMajorityMargin(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("majorityMargin", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -155,10 +155,10 @@ func (_DAO *DAO) UnpackMemberId(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("memberId", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -187,9 +187,12 @@ func (_DAO *DAO) UnpackMembers(data []byte) (MembersOutput, error) {
}
outstruct.Member = *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
outstruct.CanVote = *abi.ConvertType(out[1], new(bool)).(*bool)
outstruct.Name = *abi.ConvertType(out[2], new(string)).(*string)
outstruct.MemberSince = *abi.ConvertType(out[3], new(*big.Int)).(**big.Int)
outstruct.MemberSince = abi.ConvertType(out[3], new(big.Int)).(big.Int)
return *outstruct, err
@ -206,10 +209,10 @@ func (_DAO *DAO) UnpackMinimumQuorum(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("minimumQuorum", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -226,10 +229,10 @@ func (_DAO *DAO) UnpackNewProposal(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("newProposal", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -246,10 +249,10 @@ func (_DAO *DAO) UnpackNumProposals(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("numProposals", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -303,13 +306,21 @@ func (_DAO *DAO) UnpackProposals(data []byte) (ProposalsOutput, error) {
}
outstruct.Recipient = *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
outstruct.Amount = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Amount = abi.ConvertType(out[1], new(big.Int)).(big.Int)
outstruct.Description = *abi.ConvertType(out[2], new(string)).(*string)
outstruct.VotingDeadline = *abi.ConvertType(out[3], new(*big.Int)).(**big.Int)
outstruct.VotingDeadline = abi.ConvertType(out[3], new(big.Int)).(big.Int)
outstruct.Executed = *abi.ConvertType(out[4], new(bool)).(*bool)
outstruct.ProposalPassed = *abi.ConvertType(out[5], new(bool)).(*bool)
outstruct.NumberOfVotes = *abi.ConvertType(out[6], new(*big.Int)).(**big.Int)
outstruct.CurrentResult = *abi.ConvertType(out[7], new(*big.Int)).(**big.Int)
outstruct.NumberOfVotes = abi.ConvertType(out[6], new(big.Int)).(big.Int)
outstruct.CurrentResult = abi.ConvertType(out[7], new(big.Int)).(big.Int)
outstruct.ProposalHash = *abi.ConvertType(out[8], new([32]byte)).(*[32]byte)
return *outstruct, err
@ -334,10 +345,10 @@ func (_DAO *DAO) UnpackVote(data []byte) (*big.Int, error) {
out, err := _DAO.abi.Unpack("vote", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err

4
accounts/abi/bind/v2/internal/convertedv1bindtests/getter.go
View file

@ -72,7 +72,9 @@ func (_Getter *Getter) UnpackGetter(data []byte) (GetterOutput, error) {
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.Arg1 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Arg1 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
outstruct.Arg2 = *abi.ConvertType(out[2], new([32]byte)).(*[32]byte)
return *outstruct, err

8
accounts/abi/bind/v2/internal/convertedv1bindtests/identifiercollision.go
View file

@ -61,10 +61,10 @@ func (_IdentifierCollision *IdentifierCollision) UnpackMyVar(data []byte) (*big.
out, err := _IdentifierCollision.abi.Unpack("MyVar", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -81,10 +81,10 @@ func (_IdentifierCollision *IdentifierCollision) UnpackPubVar(data []byte) (*big
out, err := _IdentifierCollision.abi.Unpack("_myVar", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err

4
accounts/abi/bind/v2/internal/convertedv1bindtests/outputchecker.go
View file

@ -90,6 +90,7 @@ func (_OutputChecker *OutputChecker) UnpackAnonOutputs(data []byte) (AnonOutputs
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.Arg1 = *abi.ConvertType(out[1], new(string)).(*string)
return *outstruct, err
@ -117,6 +118,7 @@ func (_OutputChecker *OutputChecker) UnpackCollidingOutputs(data []byte) (Collid
}
outstruct.Str = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.Str0 = *abi.ConvertType(out[1], new(string)).(*string)
return *outstruct, err
@ -144,6 +146,7 @@ func (_OutputChecker *OutputChecker) UnpackMixedOutputs(data []byte) (MixedOutpu
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.Str = *abi.ConvertType(out[1], new(string)).(*string)
return *outstruct, err
@ -191,6 +194,7 @@ func (_OutputChecker *OutputChecker) UnpackNamedOutputs(data []byte) (NamedOutpu
}
outstruct.Str1 = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.Str2 = *abi.ConvertType(out[1], new(string)).(*string)
return *outstruct, err

2
accounts/abi/bind/v2/internal/convertedv1bindtests/structs.go
View file

@ -77,7 +77,9 @@ func (_Structs *Structs) UnpackF(data []byte) (FOutput, error) {
}
outstruct.A = *abi.ConvertType(out[0], new([]Struct0)).(*[]Struct0)
outstruct.C = *abi.ConvertType(out[1], new([]*big.Int)).(*[]*big.Int)
outstruct.D = *abi.ConvertType(out[2], new([]bool)).(*[]bool)
return *outstruct, err

12
accounts/abi/bind/v2/internal/convertedv1bindtests/token.go
View file

@ -61,10 +61,10 @@ func (_Token *Token) UnpackAllowance(data []byte) (*big.Int, error) {
out, err := _Token.abi.Unpack("allowance", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -101,10 +101,10 @@ func (_Token *Token) UnpackBalanceOf(data []byte) (*big.Int, error) {
out, err := _Token.abi.Unpack("balanceOf", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err
@ -161,10 +161,10 @@ func (_Token *Token) UnpackSpentAllowance(data []byte) (*big.Int, error) {
out, err := _Token.abi.Unpack("spentAllowance", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err

4
accounts/abi/bind/v2/internal/convertedv1bindtests/tuple.go
View file

@ -99,9 +99,13 @@ func (_Tuple *Tuple) UnpackFunc1(data []byte) (Func1Output, error) {
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(TupleS)).(*TupleS)
outstruct.Arg1 = *abi.ConvertType(out[1], new([][2]TupleT)).(*[][2]TupleT)
outstruct.Arg2 = *abi.ConvertType(out[2], new([2][]TupleT)).(*[2][]TupleT)
outstruct.Arg3 = *abi.ConvertType(out[3], new([]TupleS)).(*[]TupleS)
outstruct.Arg4 = *abi.ConvertType(out[4], new([]*big.Int)).(*[]*big.Int)
return *outstruct, err

4
accounts/abi/bind/v2/internal/convertedv1bindtests/tupler.go
View file

@ -72,7 +72,9 @@ func (_Tupler *Tupler) UnpackTuple(data []byte) (TupleOutput, error) {
}
outstruct.A = *abi.ConvertType(out[0], new(string)).(*string)
outstruct.B = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.B = abi.ConvertType(out[1], new(big.Int)).(big.Int)
outstruct.C = *abi.ConvertType(out[2], new([32]byte)).(*[32]byte)
return *outstruct, err

37
accounts/abi/bind/v2/internal/convertedv1bindtests/underscorer.go
View file

@ -70,8 +70,9 @@ func (_Underscorer *Underscorer) UnpackAllPurelyUnderscoredOutput(data []byte) (
return *outstruct, err
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Arg1 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Arg0 = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Arg1 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -97,8 +98,9 @@ func (_Underscorer *Underscorer) UnpackLowerLowerCollision(data []byte) (LowerLo
return *outstruct, err
}
outstruct.Res = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Res0 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Res = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Res0 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -124,8 +126,9 @@ func (_Underscorer *Underscorer) UnpackLowerUpperCollision(data []byte) (LowerUp
return *outstruct, err
}
outstruct.Res = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Res0 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Res = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Res0 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -151,8 +154,9 @@ func (_Underscorer *Underscorer) UnpackPurelyUnderscoredOutput(data []byte) (Pur
return *outstruct, err
}
outstruct.Arg0 = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Res = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Arg0 = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Res = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -178,7 +182,8 @@ func (_Underscorer *Underscorer) UnpackUnderscoredOutput(data []byte) (Underscor
return *outstruct, err
}
outstruct.Int = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Int = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.String = *abi.ConvertType(out[1], new(string)).(*string)
return *outstruct, err
@ -205,8 +210,9 @@ func (_Underscorer *Underscorer) UnpackUpperLowerCollision(data []byte) (UpperLo
return *outstruct, err
}
outstruct.Res = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Res0 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Res = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Res0 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -232,8 +238,9 @@ func (_Underscorer *Underscorer) UnpackUpperUpperCollision(data []byte) (UpperUp
return *outstruct, err
}
outstruct.Res = *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
outstruct.Res0 = *abi.ConvertType(out[1], new(*big.Int)).(**big.Int)
outstruct.Res = abi.ConvertType(out[0], new(big.Int)).(big.Int)
outstruct.Res0 = abi.ConvertType(out[1], new(big.Int)).(big.Int)
return *outstruct, err
@ -250,10 +257,10 @@ func (_Underscorer *Underscorer) UnpackUnderScoredFunc(data []byte) (*big.Int, e
out, err := _Underscorer.abi.Unpack("_under_scored_func", data)
if err != nil {
return *new(*big.Int), err
return new(big.Int), err
}
out0 := *abi.ConvertType(out[0], new(*big.Int)).(**big.Int)
out0 := abi.ConvertType(out[0], new(big.Int)).(*big.Int)
return out0, err