PoS_EVM
/
woop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[RPC] revert PR #3907 (#3922)

Browse Source 
* Revert "Merge pull request #3907 from harjas27/go_json"

This reverts commit 791c9d2018, reversing
changes made to 0bed4945f4.

* [api] remove unused go-ethereum/rpc

* fix go-get error

Co-authored-by: Nita Neou <soph@harmony.one>
pull/3927/head
Soph 3 years ago committed by GitHub
parent 4bf9c3e527
commit 17e6bafb3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 33 additions and 141 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      accounts/external/backend.go
  2. 2
      api/service/manager_test.go
  3. 108
      eth/rpcCmpTest.go
  4. 2
      hmy/blockchain.go
  5. 2
      hmy/gasprice.go
  6. 2
      hmy/staking.go
  7. 2
      hmy/tracer.go
  8. 2
      hmy/transaction.go
  9. 2
      node/api.go
  10. 2
      rosetta/services/account.go
  11. 2
      rosetta/services/call_service.go
  12. 2
      rosetta/services/construction_check.go
  13. 2
      rosetta/services/network.go
  14. 2
      rpc/blockchain.go
  15. 2
      rpc/contract.go
  16. 2
      rpc/eth/rpc.go
  17. 2
      rpc/filters/api.go
  18. 2
      rpc/filters/filter.go
  19. 2
      rpc/filters/filter_criteria.go
  20. 2
      rpc/filters/filter_system.go
  21. 2
      rpc/harmony.go
  22. 2
      rpc/net.go
  23. 2
      rpc/pool.go
  24. 2
      rpc/private_debug.go
  25. 2
      rpc/public_debug.go
  26. 2
      rpc/rpc.go
  27. 2
      rpc/staking.go
  28. 2
      rpc/tracer.go
  29. 2
      rpc/tracerParity.go
  30. 2
      rpc/transaction.go
  31. 2
      rpc/types.go
  32. 2
      rpc/v1/legacy.go
  33. 2
      rpc/v2/legacy.go
  34. 2
      rpc/web3.go

2
accounts/external/backend.go vendored
Unescape View File

@ -26,10 +26,10 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/signer/core"
"github.com/harmony-one/harmony/accounts"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
)
// ExternalBackend is a struct for external backend

2
api/service/manager_test.go
Unescape View File

@ -6,7 +6,7 @@ import (
"strings"
"testing"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
)
func TestManager_StartServices(t *testing.T) {

108
eth/rpcCmpTest.go
View File

File diff suppressed because one or more lines are too long

2
hmy/blockchain.go
Unescape View File

@ -8,6 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/bloombits"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
@ -15,7 +16,6 @@ import (
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/crypto/bls"
internal_bls "github.com/harmony-one/harmony/crypto/bls"
"github.com/harmony-one/harmony/eth/rpc"
internal_common "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/internal/params"
"github.com/harmony-one/harmony/internal/utils"

2
hmy/gasprice.go
Unescape View File

@ -23,8 +23,8 @@ import (
"sort"
"sync"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/internal/utils"
"github.com/ethereum/go-ethereum/common"

2
hmy/staking.go
Unescape View File

@ -7,11 +7,11 @@ import (
"sync"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/consensus/quorum"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/internal/chain"
internalCommon "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/numeric"

2
hmy/tracer.go
Unescape View File

@ -30,12 +30,12 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/trie"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy/tracers"
"github.com/harmony-one/harmony/internal/utils"
)

2
hmy/transaction.go
Unescape View File

@ -4,10 +4,10 @@ import (
"context"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
)
// SendTx ...

2
node/api.go
Unescape View File

@ -1,9 +1,9 @@
package node
import (
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/consensus/quorum"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy"
"github.com/harmony-one/harmony/rosetta"
hmy_rpc "github.com/harmony-one/harmony/rpc"

2
rosetta/services/account.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/coinbase/rosetta-sdk-go/server"
"github.com/coinbase/rosetta-sdk-go/types"
ethCommon "github.com/ethereum/go-ethereum/common"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
hmyTypes "github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/hmy"

2
rosetta/services/call_service.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/coinbase/rosetta-sdk-go/server"
"github.com/coinbase/rosetta-sdk-go/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/rosetta/common"

2
rosetta/services/construction_check.go
Unescape View File

@ -11,7 +11,7 @@ import (
"github.com/coinbase/rosetta-sdk-go/types"
ethCommon "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
ethRpc "github.com/harmony-one/harmony/eth/rpc"
ethRpc "github.com/ethereum/go-ethereum/rpc"
"github.com/pkg/errors"
"github.com/harmony-one/harmony/internal/params"

2
rosetta/services/network.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/coinbase/rosetta-sdk-go/server"
"github.com/coinbase/rosetta-sdk-go/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/libp2p/go-libp2p-core/peer"
"github.com/harmony-one/harmony/block"

2
rpc/blockchain.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
lru "github.com/hashicorp/golang-lru"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"

2
rpc/contract.go
Unescape View File

@ -8,9 +8,9 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/common/denominations"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy"
hmyCommon "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/internal/utils"

2
rpc/eth/rpc.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
)

2
rpc/filters/api.go
Unescape View File

@ -8,9 +8,9 @@ import (
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
hmy_rpc "github.com/harmony-one/harmony/rpc"
)

2
rpc/filters/filter.go
Unescape View File

@ -26,10 +26,10 @@ import (
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
)
// Backend provides the APIs needed for filter

2
rpc/filters/filter_criteria.go
Unescape View File

@ -9,7 +9,7 @@ import (
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
)
// FilterCriteria represents a request to create a new filter.

2
rpc/filters/filter_system.go
Unescape View File

@ -28,11 +28,11 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
)
// Type determines the kind of filter and is used to put the filter in to

2
rpc/harmony.go
Unescape View File

@ -5,7 +5,7 @@ import (
"math/big"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
)

2
rpc/net.go
Unescape View File

@ -5,7 +5,7 @@ import (
"fmt"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/p2p"

2
rpc/pool.go
Unescape View File

@ -9,9 +9,9 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy"
common2 "github.com/harmony-one/harmony/internal/common"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"

2
rpc/private_debug.go
Unescape View File

@ -3,7 +3,7 @@ package rpc
import (
"context"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
)

2
rpc/public_debug.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/ethereum/go-ethereum/log"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
"github.com/harmony-one/harmony/internal/utils"
)

2
rpc/rpc.go
Unescape View File

@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
"github.com/harmony-one/harmony/internal/utils"

2
rpc/staking.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/shard"

2
rpc/tracer.go
Unescape View File

@ -25,10 +25,10 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy"
)

2
rpc/tracerParity.go
Unescape View File

@ -6,7 +6,7 @@ import (
"errors"
"github.com/ethereum/go-ethereum/common"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
)

2
rpc/transaction.go
Unescape View File

@ -10,12 +10,12 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/accounts/abi"
"github.com/harmony-one/harmony/core"
"github.com/harmony-one/harmony/core/rawdb"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/core/vm"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
"github.com/harmony-one/harmony/internal/params"

2
rpc/types.go
Unescape View File

@ -17,9 +17,9 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/block"
"github.com/harmony-one/harmony/core/types"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/harmony-one/harmony/internal/utils"
"github.com/harmony-one/harmony/numeric"
"github.com/harmony-one/harmony/shard"

2
rpc/v1/legacy.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
)

2
rpc/v2/legacy.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context"
"math/big"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
"github.com/harmony-one/harmony/hmy"
internal_common "github.com/harmony-one/harmony/internal/common"
)

2
rpc/web3.go
Unescape View File

@ -3,7 +3,7 @@ package rpc
import (
"context"
"github.com/harmony-one/harmony/eth/rpc"
"github.com/ethereum/go-ethereum/rpc"
nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
)

Write Preview
Loading…
Cancel
Save