Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@linhpn99
linhpn99 committed Aug 26, 2024
1 parent 02e0c1a commit a48eb8f
Showing 1 changed file with 27 additions and 55 deletions.
82 changes: 27 additions & 55 deletions gno.land/pkg/gnoclient/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ func TestCallSingle_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()

signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -78,12 +76,9 @@ func TestCallSingle_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -176,8 +171,7 @@ func TestCallMultiple_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -234,8 +228,7 @@ func TestSendSingle_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -287,12 +280,9 @@ func TestSendSingle_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sender := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sender := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -405,8 +395,7 @@ func TestSendMultiple_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -466,12 +455,9 @@ func TestSendMultiple_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sender := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sender := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -593,8 +579,7 @@ func TestRunSingle_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -655,12 +640,9 @@ func TestRunSingle_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -773,8 +755,7 @@ func TestRunMultiple_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -859,12 +840,9 @@ func TestRunMultiple_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -1000,8 +978,7 @@ func TestAddPackageSingle_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -1073,12 +1050,9 @@ func TestAddPackageSingle_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -1203,8 +1177,7 @@ func TestAddPackageMultiple_Integration(t *testing.T) {
defer node.Stop()

// Init Signer & RPCClient
keybase := keys.NewInMemory()
signer := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
signer := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
rpcClient, err := rpcclient.NewHTTPClient(remoteAddr)
require.NoError(t, err)

Expand Down Expand Up @@ -1314,12 +1287,9 @@ func TestAddPackageMultiple_Sponsor_Integration(t *testing.T) {
node, remoteAddr := integration.TestingInMemoryNode(t, log.NewNoopLogger(), config)
defer node.Stop()

// Initialize in-memory key storage
keybase := keys.NewInMemory()

// Create signer accounts for sponsor and sponsoree
sponsor := newInMemorySigner(t, keybase, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, keybase, generateMnemonic(t), "test2")
sponsor := newInMemorySigner(t, integration.DefaultAccount_Seed, integration.DefaultAccount_Name)
sponsoree := newInMemorySigner(t, generateMnemonic(t), "test2")

sponsorInfo, err := sponsor.Info()
require.NoError(t, err)
Expand Down Expand Up @@ -1475,14 +1445,16 @@ func Hello(str string) string {
assert.Equal(t, baseAcc.GetCoins(), deposit)
}

func newInMemorySigner(t *testing.T, kb keys.Keybase, mnemonic, accName string) *SignerFromKeybase {
func newInMemorySigner(t *testing.T, mnemonic, accName string) *SignerFromKeybase {
t.Helper()

_, err := kb.CreateAccount(accName, mnemonic, "", "", uint32(0), uint32(0))
keybase := keys.NewInMemory()

_, err := keybase.CreateAccount(accName, mnemonic, "", "", uint32(0), uint32(0))
require.NoError(t, err)

return &SignerFromKeybase{
Keybase: kb, // Stores keys in memory or on disk
Keybase: keybase, // Stores keys in memory or on disk
Account: accName, // Account name or bech32 format
Password: "", // Password for encryption
ChainID: "tendermint_test", // Chain ID for transaction signing
Expand Down

0 comments on commit a48eb8f

Please sign in to comment.