Skip to content

Commit 26f6000

Browse files
Monika-BitflyMonika-Bitfly
committed
test: updated tests
1 parent 802c420 commit 26f6000

File tree

3 files changed

+64
-47
lines changed

3 files changed

+64
-47
lines changed

‎backend/internal/th/ethereum.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -207,16 +207,6 @@ func (b *BlockchainBackend) DeployContract(t *testing.T, contractData []byte) co
207207
return receipt.ContractAddress
208208
}
209209

210-
func (b *BlockchainBackend) NewERC20Metadata(t *testing.T, address common.Address) (*contracts.IERC20Metadata, error) {
211-
t.Helper()
212-
contract, err := contracts.NewIERC20Metadata(address, b.Client())
213-
if err != nil {
214-
return nil, err
215-
}
216-
217-
return contract, nil
218-
}
219-
220210
func (b *BlockchainBackend) DeployERC20(t *testing.T, name string, symbol string, accounts ...common.Address) (common.Address, *contracts.ERC20) {
221211
t.Helper()
222212
address, _, token, err := contracts.DeployERC20(b.BankAccount.TransactOpts, b.Client(), name, symbol)

‎backend/pkg/commons/rpc/utils_test.go‎

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/ethereum/go-ethereum/common"
1010
gethtypes "github.com/ethereum/go-ethereum/core/types"
11+
"github.com/gobitfly/beaconchain/internal/contracts"
1112
"github.com/gobitfly/beaconchain/internal/th"
1213
"github.com/gobitfly/beaconchain/pkg/commons/types"
1314
"google.golang.org/protobuf/types/known/timestamppb"
@@ -412,25 +413,25 @@ func TestParseAddressBalance(t *testing.T) {
412413
if result != nil {
413414
t.Errorf("expected result to be nil on error, got %v", result)
414415
}
415-
} else {
416-
if err != nil {
417-
t.Errorf("unexpected error: %v", err)
416+
}
417+
if err != nil {
418+
t.Errorf("unexpected error: %v", err)
419+
}
420+
if len(result) != len(tt.expected) {
421+
t.Fatalf("got %v balances, want %v balances", len(result), len(tt.expected))
422+
}
423+
for i, res := range result {
424+
if !bytes.Equal(res.Address, tt.expected[i].Address) {
425+
t.Errorf("got Address %v, want %v", res.Address, tt.expected[i].Address)
418426
}
419-
if len(result) != len(tt.expected) {
420-
t.Fatalf("got %v balances, want %v balances", len(result), len(tt.expected))
427+
if !bytes.Equal(res.Token, tt.expected[i].Token) {
428+
t.Errorf("got Token %v, want %v", res.Token, tt.expected[i].Token)
421429
}
422-
for i, res := range result {
423-
if !bytes.Equal(res.Address, tt.expected[i].Address) {
424-
t.Errorf("got Address %v, want %v", res.Address, tt.expected[i].Address)
425-
}
426-
if !bytes.Equal(res.Token, tt.expected[i].Token) {
427-
t.Errorf("got Token %v, want %v", res.Token, tt.expected[i].Token)
428-
}
429-
if !bytes.Equal(res.Balance, tt.expected[i].Balance) {
430-
t.Errorf("got Balance %v, want %v", res.Balance, tt.expected[i].Balance)
431-
}
430+
if !bytes.Equal(res.Balance, tt.expected[i].Balance) {
431+
t.Errorf("got Balance %v, want %v", res.Balance, tt.expected[i].Balance)
432432
}
433433
}
434+
434435
})
435436
}
436437
}
@@ -632,7 +633,7 @@ func TestGetERC20ContractSymbol(t *testing.T) {
632633
ret := &types.ERC20Metadata{}
633634

634635
contractAddress, _ := backend.DeployERC20(t, "usdt", "USDT", backend.BankAccount.From)
635-
contractMetadata, err := backend.NewERC20Metadata(t, contractAddress)
636+
contractMetadata, err := contracts.NewIERC20Metadata(contractAddress, backend.Client())
636637
if err != nil {
637638
t.Fatalf("could not create contract: %v", err)
638639
}
@@ -654,11 +655,15 @@ func TestGetERC20ContractSymbol(t *testing.T) {
654655
for _, tt := range test {
655656
t.Run(tt.name, func(t *testing.T) {
656657
err := getERC20ContractSymbol(contractMetadata, ret)
657-
if err != nil && tt.expectedErr == nil {
658-
t.Fatalf("unexpected error: %v", err)
658+
if err != nil {
659+
if tt.expectedErr == nil {
660+
t.Fatalf("unexpected error: %v", err)
661+
}
659662
}
660-
if err == nil && tt.expectedErr != nil {
661-
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
663+
if err == nil {
664+
if tt.expectedErr != nil {
665+
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
666+
}
662667
}
663668
if ret.Symbol != tt.expected {
664669
t.Errorf("got Symbol %v, want %v", ret.Symbol, tt.expected)
@@ -667,7 +672,7 @@ func TestGetERC20ContractSymbol(t *testing.T) {
667672
}
668673

669674
contractAddress2, _ := backend.DeployERC20(t, "usdt", "", backend.BankAccount.From)
670-
contractMetadata2, err := backend.NewERC20Metadata(t, contractAddress2)
675+
contractMetadata2, err := contracts.NewIERC20Metadata(contractAddress2, backend.Client())
671676
if err != nil {
672677
t.Fatalf("could not create contract: %v", err)
673678
}
@@ -689,11 +694,15 @@ func TestGetERC20ContractSymbol(t *testing.T) {
689694
for _, tt := range test2 {
690695
t.Run(tt.name, func(t *testing.T) {
691696
err := getERC20ContractSymbol(contractMetadata2, ret)
692-
if err != nil && tt.expectedErr == nil {
693-
t.Fatalf("unexpected error: %v", err)
697+
if err != nil {
698+
if tt.expectedErr == nil {
699+
t.Fatalf("unexpected error: %v", err)
700+
}
694701
}
695-
if err == nil && tt.expectedErr != nil {
696-
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
702+
if err != nil {
703+
if tt.expectedErr != nil {
704+
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
705+
}
697706
}
698707
if ret.Symbol != tt.expected {
699708
t.Errorf("got Symbol %v, want %v", ret.Symbol, tt.expected)
@@ -709,7 +718,7 @@ func TestGetERC20ContractTotalSupply(t *testing.T) {
709718
ret := &types.ERC20Metadata{}
710719

711720
contractAddress, _ := backend.DeployERC20(t, "usdt", "USDT", backend.BankAccount.From)
712-
contractMetadata, err := backend.NewERC20Metadata(t, contractAddress)
721+
contractMetadata, err := contracts.NewIERC20Metadata(contractAddress, backend.Client())
713722
if err != nil {
714723
t.Fatalf("could not create contract: %v", err)
715724
}
@@ -731,8 +740,10 @@ func TestGetERC20ContractTotalSupply(t *testing.T) {
731740
for _, tt := range tests {
732741
t.Run(tt.name, func(t *testing.T) {
733742
err := getERC20ContractTotalSupply(contractMetadata, ret)
734-
if err != nil && tt.expectedErr == nil {
735-
t.Fatalf("unexpected error: %v", err)
743+
if err != nil {
744+
if tt.expectedErr == nil {
745+
t.Fatalf("unexpected error: %v", err)
746+
}
736747
}
737748
if err == nil && tt.expectedErr != nil {
738749
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
@@ -751,7 +762,7 @@ func TestGetERC20ContractDecimals(t *testing.T) {
751762
ret := &types.ERC20Metadata{}
752763

753764
contractAddress, _ := backend.DeployERC20(t, "usdt", "USDT", backend.BankAccount.From)
754-
contractMetadata, err := backend.NewERC20Metadata(t, contractAddress)
765+
contractMetadata, err := contracts.NewIERC20Metadata(contractAddress, backend.Client())
755766
if err != nil {
756767
t.Fatalf("could not create contract: %v", err)
757768
}
@@ -773,11 +784,15 @@ func TestGetERC20ContractDecimals(t *testing.T) {
773784
for _, tt := range tests {
774785
t.Run(tt.name, func(t *testing.T) {
775786
err := getERC20ContractDecimals(contractMetadata, ret)
776-
if err != nil && tt.expectedErr == nil {
777-
t.Fatalf("unexpected error: %v", err)
787+
if err != nil {
788+
if tt.expectedErr == nil {
789+
t.Fatalf("unexpected error: %v", err)
790+
}
778791
}
779-
if err == nil && tt.expectedErr != nil {
780-
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
792+
if err != nil {
793+
if tt.expectedErr != nil {
794+
t.Fatalf("expected error: %v, got nil", tt.expectedErr)
795+
}
781796
}
782797
if !bytes.Equal(ret.Decimals, tt.expected) {
783798
t.Errorf("got Decimals %v, want %v", ret.Decimals, tt.expected)

‎backend/pkg/executionlayer/transformer_test.go‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,10 +2204,22 @@ func TestVerifyName(t *testing.T) {
22042204
for _, tt := range tests {
22052205
t.Run(tt.name, func(t *testing.T) {
22062206
result := verifyName(tt.input)
2207-
if (result == nil && tt.expected != nil) || (result != nil && tt.expected == nil) {
2208-
t.Errorf("got %v, want %v", result, tt.expected)
2209-
} else if result != nil && tt.expected != nil && result.Error() != tt.expected.Error() {
2210-
t.Errorf("got %v, want %v", result, tt.expected)
2207+
2208+
if result != nil {
2209+
if tt.expected == nil {
2210+
t.Errorf("got %v, want %v", result, tt.expected)
2211+
2212+
}
2213+
if tt.expected != nil {
2214+
if result.Error() != tt.expected.Error() {
2215+
t.Errorf("got %v, want %v", result, tt.expected)
2216+
}
2217+
}
2218+
}
2219+
if result == nil {
2220+
if tt.expected != nil {
2221+
t.Errorf("got %v, want %v", result, tt.expected)
2222+
}
22112223
}
22122224
})
22132225
}

0 commit comments

Comments
 (0)