diff options
| author | Felix Lange <fjl@twurst.com> | 2016-12-17 22:39:55 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-12-20 21:41:58 +0800 |
| commit | cf71f5cd604f4d5c94d9e9b12b121a614d662dc7 (patch) | |
| tree | a89491c26dc19fc39bb6d8273eeefa2778ff5ec2 /whisper/shhapi | |
| parent | adab2e16bdf24c2eaf498722187fb36c04a5376b (diff) | |
| download | go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar.gz go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar.bz2 go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar.lz go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar.xz go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.tar.zst go-tangerine-cf71f5cd604f4d5c94d9e9b12b121a614d662dc7.zip | |
rpc: remove HexNumber, replace all uses with hexutil types
This change couldn't be automated because HexNumber was used for numbers
of all sizes.
Diffstat (limited to 'whisper/shhapi')
| -rw-r--r-- | whisper/shhapi/api.go | 6 | ||||
| -rw-r--r-- | whisper/shhapi/api_test.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/whisper/shhapi/api.go b/whisper/shhapi/api.go index 8a0bd9214..24d54b653 100644 --- a/whisper/shhapi/api.go +++ b/whisper/shhapi/api.go @@ -73,11 +73,11 @@ func (api *PublicWhisperAPI) Stop() error { } // Version returns the Whisper version this node offers. -func (api *PublicWhisperAPI) Version() (*rpc.HexNumber, error) { +func (api *PublicWhisperAPI) Version() (hexutil.Uint, error) { if api.whisper == nil { - return rpc.NewHexNumber(0), whisperOffLineErr + return 0, whisperOffLineErr } - return rpc.NewHexNumber(api.whisper.Version()), nil + return hexutil.Uint(api.whisper.Version()), nil } // MarkPeerTrusted marks specific peer trusted, which will allow it diff --git a/whisper/shhapi/api_test.go b/whisper/shhapi/api_test.go index a10e2e476..d2890a9a3 100644 --- a/whisper/shhapi/api_test.go +++ b/whisper/shhapi/api_test.go @@ -39,8 +39,8 @@ func TestBasic(t *testing.T) { t.Fatalf("failed generateFilter: %s.", err) } - if ver.Uint64() != whisperv5.ProtocolVersion { - t.Fatalf("wrong version: %d.", ver.Uint64()) + if uint64(ver) != whisperv5.ProtocolVersion { + t.Fatalf("wrong version: %d.", ver) } mail := api.GetFilterChanges(1) |