Add missing err check 2 (keybase#11342)

* Add missing err check 2 * fix tests
tendi09 · Apr 12, 2018 · 0fde99d · 0fde99d
1 parent ab8cdb3
commit 0fde99d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/go/stellar/stellar.go b/go/stellar/stellar.go
@@ -95,6 +95,9 @@ func Upkeep(ctx context.Context, g *libkb.GlobalContext) (err error) {
 
 func ImportSecretKey(ctx context.Context, g *libkb.GlobalContext, secretKey stellar1.SecretKey, makePrimary bool) (err error) {
 	prevBundle, _, err := remote.Fetch(ctx, g)
+	if err != nil {
+		return err
+	}
 	nextBundle := bundle.Advance(prevBundle)
 	err = bundle.AddAccount(&nextBundle, secretKey, "", makePrimary)
 	if err != nil {

diff --git a/go/stellar/stellarsvc/service_test.go b/go/stellar/stellarsvc/service_test.go
@@ -182,6 +182,9 @@ func TestSendLocalStellarAddress(t *testing.T) {
 	_, tcs, cleanup := setupNTests(t, 1)
 	defer cleanup()
 
+	_, err := stellar.CreateWallet(context.Background(), tcs[0].G)
+	require.NoError(t, err)
+
 	srv, rm := newTestServer(tcs[0].G)
 	accountIDSender := rm.AddAccount(t)
 	accountIDRecip := rm.AddAccount(t)
@@ -190,7 +193,7 @@ func TestSendLocalStellarAddress(t *testing.T) {
 		SecretKey:   rm.SecretKey(t, accountIDSender),
 		MakePrimary: true,
 	}
-	err := srv.ImportSecretKeyLocal(context.Background(), argImport)
+	err = srv.ImportSecretKeyLocal(context.Background(), argImport)
 	require.NoError(t, err)
 
 	arg := stellar1.SendLocalArg{
@@ -219,6 +222,11 @@ func TestSendLocalKeybase(t *testing.T) {
 	fus, tcs, cleanup := setupNTests(t, 2)
 	defer cleanup()
 
+	_, err := stellar.CreateWallet(context.Background(), tcs[0].G)
+	require.NoError(t, err)
+	_, err = stellar.CreateWallet(context.Background(), tcs[1].G)
+	require.NoError(t, err)
+
 	srvSender, rm := newTestServer(tcs[0].G)
 	accountIDSender := rm.AddAccount(t)
 	accountIDRecip := rm.AddAccount(t)
@@ -229,7 +237,7 @@ func TestSendLocalKeybase(t *testing.T) {
 		SecretKey:   rm.SecretKey(t, accountIDSender),
 		MakePrimary: true,
 	}
-	err := srvSender.ImportSecretKeyLocal(context.Background(), argImport)
+	err = srvSender.ImportSecretKeyLocal(context.Background(), argImport)
 	require.NoError(t, err)
 
 	argImport.SecretKey = rm.SecretKey(t, accountIDRecip)