diff --git a/integration/rpctransact/name_test.go b/integration/rpctransact/name_test.go index 3ba4a77f5bdebbf4953a8534d32528de00a32984..8c3a3bd34a1da1fb936eb7a09e21699ca3ea9411 100644 --- a/integration/rpctransact/name_test.go +++ b/integration/rpctransact/name_test.go @@ -33,6 +33,10 @@ func TestNameTxSync(t *testing.T) { qcli := rpctest.NewQueryClient(t, testConfig.RPC.GRPC.ListenAddress) entry, err := qcli.GetName(context.Background(), &rpcquery.GetNameParam{ + Name: "n'existe pas", + }) + require.Error(t, err) + entry, err = qcli.GetName(context.Background(), &rpcquery.GetNameParam{ Name: name, }) require.NoError(t, err) @@ -40,6 +44,7 @@ func TestNameTxSync(t *testing.T) { assert.Equal(t, data, entry.Data) assert.Equal(t, inputAddress, entry.Owner) assert.True(t, entry.Expires >= expiresIn, "expiry should be later than expiresIn") + } func TestNameReg(t *testing.T) { @@ -56,7 +61,7 @@ func TestNameReg(t *testing.T) { txe := rpctest.UpdateName(t, tcli, inputAddress, name, data, numDesiredBlocks) entry := txe.Result.NameEntry - assert.NotNil(t, entry, "name shoudl return") + assert.NotNil(t, entry, "name should return") _, ok := txe.Envelope.Tx.Payload.(*payload.NameTx) require.True(t, ok, "should be NameTx: %v", txe.Envelope.Tx.Payload) diff --git a/rpc/rpcquery/query_server.go b/rpc/rpcquery/query_server.go index bb5651da27d93b9e8c3fe5a50edc012c0de7b7e0..97f6fa456a210ee7f4a63b999a483c2c4301e37d 100644 --- a/rpc/rpcquery/query_server.go +++ b/rpc/rpcquery/query_server.go @@ -2,6 +2,7 @@ package rpcquery import ( "context" + "fmt" "github.com/hyperledger/burrow/acm" "github.com/hyperledger/burrow/acm/state" @@ -67,8 +68,12 @@ func (qs *queryServer) ListAccounts(param *ListAccountsParam, stream Query_ListA } // Name registry -func (qs *queryServer) GetName(ctx context.Context, param *GetNameParam) (*names.Entry, error) { - return qs.nameReg.GetName(param.Name) +func (qs *queryServer) GetName(ctx context.Context, param *GetNameParam) (entry *names.Entry, err error) { + entry, err = qs.nameReg.GetName(param.Name) + if entry == nil && err == nil { + err = fmt.Errorf("name %s not found", param.Name) + } + return } func (qs *queryServer) ListNames(param *ListNamesParam, stream Query_ListNamesServer) error { diff --git a/txs/payload/tx_input.go b/txs/payload/tx_input.go index b3367aca4577df7d601eade8a30e07b071392c5d..99a5f3e546a4637c2f3108dbc46e6be67fba2da4 100644 --- a/txs/payload/tx_input.go +++ b/txs/payload/tx_input.go @@ -38,7 +38,7 @@ func ValidateInputs(getter state.AccountGetter, ins []*TxInput) error { return err } if acc == nil { - return fmt.Errorf("validateInputs() expects to be able to retrive accoutn %v but it was not found", + return fmt.Errorf("validateInputs() expects to be able to retrieve account %v but it was not found", in.Address) } err = in.Validate(acc)