Fix some tests

tonkeeper · Dec 14, 2023 · 5913463 · 5913463
1 parent b715c26
commit 5913463
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 18 deletions.
diff --git a/abi/generated_test.go b/abi/generated_test.go
@@ -377,7 +377,7 @@ func TestGetMethods(t *testing.T) {
 
 func TestWhalesNominators(t *testing.T) {
 	address := ton.MustParseAccountID("EQBI-wGVp_x0VFEjd7m9cEUD3tJ_bnxMSp0Tb9qz757ATEAM")
-	client, err := liteapi.NewClientWithDefaultMainnet()
+	client, err := liteapi.NewClient(liteapi.Mainnet(), liteapi.FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/address_test.go b/address_test.go
@@ -3,10 +3,19 @@ package tongo
 import (
 	"context"
 	"testing"
+
+	"github.com/tonkeeper/tongo/contract/dns"
+	"github.com/tonkeeper/tongo/liteapi"
+	"github.com/tonkeeper/tongo/ton"
 )
 
 func TestParseAddress(t *testing.T) {
-	parser := DefaultAddressParser()
+	cli, err := liteapi.NewClient(liteapi.Mainnet(), liteapi.FromEnvs())
+	if err != nil {
+		t.Fatalf("failed to create liteapi client: %v", err)
+	}
+	resolver := dns.NewDNS(ton.MustParseAccountID(DefaultRoot), cli)
+	parser := NewAccountAddressParser(resolver)
 
 	const (
 		parseToHumanAddress = iota

diff --git a/contract/dns/dns_test.go b/contract/dns/dns_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestResolve(t *testing.T) {
-	client, err := liteapi.NewClientWithDefaultMainnet()
+	client, err := liteapi.NewClient(liteapi.Mainnet(), liteapi.FromEnvs())
 	if err != nil {
 		log.Fatalf("Unable to create tongo client: %v", err)
 	}

diff --git a/liteapi/client_test.go b/liteapi/client_test.go
@@ -82,7 +82,7 @@ func TestSendRawMessage(t *testing.T) {
 }
 
 func TestRunSmcMethod(t *testing.T) {
-	tongoClient, err := NewClientWithDefaultMainnet()
+	tongoClient, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		log.Fatalf("Unable to create tongo client: %v", err)
 	}
@@ -94,7 +94,7 @@ func TestRunSmcMethod(t *testing.T) {
 }
 
 func TestGetAllShards(t *testing.T) {
-	api, err := NewClientWithDefaultMainnet()
+	api, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -115,7 +115,7 @@ func TestGetAllShards(t *testing.T) {
 }
 
 func TestGetBlock(t *testing.T) {
-	api, err := NewClientWithDefaultMainnet()
+	api, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -136,7 +136,7 @@ func TestGetBlock(t *testing.T) {
 }
 
 func TestGetConfigAll(t *testing.T) {
-	api, err := NewClientWithDefaultMainnet()
+	api, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -147,7 +147,7 @@ func TestGetConfigAll(t *testing.T) {
 }
 
 func TestGetAccountState(t *testing.T) {
-	api, err := NewClientWithDefaultMainnet()
+	api, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -180,7 +180,7 @@ func TestGetAccountState(t *testing.T) {
 }
 
 func TestLookupBlock(t *testing.T) {
-	api, err := NewClientWithDefaultMainnet()
+	api, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -202,7 +202,7 @@ func TestLookupBlock(t *testing.T) {
 }
 
 func TestGetOneTransaction(t *testing.T) {
-	tongoClient, err := NewClientWithDefaultMainnet()
+	tongoClient, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		log.Fatalf("Unable to create tongo client: %v", err)
 	}
@@ -242,7 +242,7 @@ func TestGetOneTransaction(t *testing.T) {
 }
 
 func TestGetLibraries(t *testing.T) {
-	tongoClient, err := NewClientWithDefaultMainnet()
+	tongoClient, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		log.Fatalf("Unable to create tongo client: %v", err)
 	}
@@ -323,7 +323,7 @@ func TestDnsResolve(t *testing.T) {
 }
 
 func TestGetRootDNS(t *testing.T) {
-	tongoClient, err := NewClientWithDefaultMainnet()
+	tongoClient, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		log.Fatalf("Unable to create tongo client: %v", err)
 	}
@@ -350,7 +350,7 @@ func TestClient_GetTransactionsForUnknownAccount(t *testing.T) {
 
 func TestMappingTransactionsToBlocks(t *testing.T) {
 	const limit = 100
-	c, err := NewClientWithDefaultMainnet()
+	c, err := NewClient(Mainnet(), FromEnvs())
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/tonconnect/server_test.go b/tonconnect/server_test.go
@@ -8,8 +8,14 @@ import (
 )
 
 func TestGenerateAndVerifyPayload(t *testing.T) {
-	liteApiClient, _ := liteapi.NewClientWithDefaultMainnet()
-	tonConnect, _ := NewTonConnect(liteApiClient, "my_secret", WithLifeTimePayload(300), WithLifeTimeProof(300))
+	liteApiClient, err := liteapi.NewClient(liteapi.Mainnet(), liteapi.FromEnvs())
+	if err != nil {
+		t.Fatalf("failed create liteapi client: %v", err)
+	}
+	tonConnect, err := NewTonConnect(liteApiClient, "my_secret", WithLifeTimePayload(300), WithLifeTimeProof(300))
+	if err != nil {
+		t.Fatalf("failed create tonconnect: %v", err)
+	}
 
 	payload, err := tonConnect.GeneratePayload()
 	if err != nil {
@@ -26,8 +32,14 @@ func TestGenerateAndVerifyPayload(t *testing.T) {
 }
 
 func TestExpirePayload(t *testing.T) {
-	liteApiClient, _ := liteapi.NewClientWithDefaultMainnet()
-	tonConnect, _ := NewTonConnect(liteApiClient, "my_secret", WithLifeTimePayload(1), WithLifeTimeProof(1)) // set little lifetime
+	liteApiClient, err := liteapi.NewClient(liteapi.Mainnet(), liteapi.FromEnvs())
+	if err != nil {
+		t.Fatalf("failed create liteapi client: %v", err)
+	}
+	tonConnect, err := NewTonConnect(liteApiClient, "my_secret", WithLifeTimePayload(1), WithLifeTimeProof(1)) // set little lifetime
+	if err != nil {
+		t.Fatalf("failed create tonconnect: %v", err)
+	}
 
 	payload, err := tonConnect.GeneratePayload()
 	if err != nil {

diff --git a/txemulator/txemulator_test.go b/txemulator/txemulator_test.go