From 87acf408a43689ecd578aa9274c1cb937a07cab1 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Wed, 13 Sep 2017 02:29:44 +0200 Subject: [PATCH] Revert "switch to jsoniter" This reverts commit b112a18aa59e65ee2c2b44351342e70172d8fe69. --- Gopkg.lock | 10 +++++----- Gopkg.toml | 4 ---- bitcoinrpc.go | 7 +++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index adaff27b..61865709 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -26,10 +26,10 @@ revision = "501929d3d046174c3d39f0ea54ece471aa17238c" [[projects]] - name = "github.com/json-iterator/go" - packages = ["."] - revision = "36b14963da70d11297d313183d7e6388c8510e1e" - version = "1.0.0" + branch = "master" + name = "github.com/hashicorp/golang-lru" + packages = [".","simplelru"] + revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6" [[projects]] branch = "master" @@ -46,6 +46,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "827d405fafae0abd3b872001a1c24ad4e89a6302acd15d6eb1f3a5dfc6b18cdd" + inputs-digest = "3bb30a1d65e170c9b0f282efa56af8096dc74f149744743dddd27f26e1880612" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 213b0f74..f92435a9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -40,7 +40,3 @@ [[constraint]] branch = "master" name = "github.com/tecbot/gorocksdb" - -[[constraint]] - name = "github.com/json-iterator/go" - version = "1.0.0" diff --git a/bitcoinrpc.go b/bitcoinrpc.go index 21d561bd..46ab0cf2 100644 --- a/bitcoinrpc.go +++ b/bitcoinrpc.go @@ -3,12 +3,11 @@ package main import ( "bytes" "encoding/hex" + "encoding/json" "fmt" "log" "net/http" "time" - - jsoniter "github.com/json-iterator/go" ) type RPCError struct { @@ -304,7 +303,7 @@ func (b *BitcoinRPC) GetAddress(txid string, vout uint32) (string, error) { } func (b *BitcoinRPC) call(req interface{}, res interface{}) error { - httpData, err := jsoniter.Marshal(req) + httpData, err := json.Marshal(req) if err != nil { return err } @@ -318,5 +317,5 @@ func (b *BitcoinRPC) call(req interface{}, res interface{}) error { return err } defer httpRes.Body.Close() - return jsoniter.NewDecoder(httpRes.Body).Decode(res) + return json.NewDecoder(httpRes.Body).Decode(&res) }