Merge pull request #201 from Bytom/v0.1

[bytom/vapor.git] / api / api_test.go

diff --git a/api/api_test.go b/api/api_test.go
index bc7627c..e984083 100644 (file)
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -2,18 +2,13 @@ package api
 
 import (
        "context"
-       "encoding/json"
-       "math"
        "net/http/httptest"
        "os"
        "testing"
 
-       dbm "github.com/tendermint/tmlibs/db"
-
        "github.com/vapor/accesstoken"
        "github.com/vapor/blockchain/rpc"
-       "github.com/vapor/blockchain/txbuilder"
-       "github.com/vapor/consensus"
+       dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/testutil"
 )
 
@@ -100,72 +95,3 @@ func TestAPIHandler(t *testing.T) {
                }
        }
 }
-
-func TestEstimateTxGas(t *testing.T) {
-       tmplStr := `{"raw_transaction":"0701a8d30201010060015e7e8cf2b20c310f7a8197d598f04a04470eda4d59470661d124b688b507525a9dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80c8afa0250101160014b6fd589b689b2e7a8772c5c0a855734851c2f72a010001013dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8086d8f02401160014b6fd589b689b2e7a8772c5c0a855734851c2f72a00667b2254797065223a3231302c2244617461223a2265794a6d62334a6e5a584a7a496a7062496e5a7a625446784d32316d625752324e6a52714d6e70684d4755326548646c64475a77634745304e326833633368325a7a6b7a5a6e5635655730695858303d227d","signing_instructions":[{"position":0,"witness_components":[{"type":"raw_tx_signature","quorum":1,"keys":[{"xpub":"67e1a63e43dbd7148aa3ffe5a8e869ff5d89f687d1d29f6224a95bd0ce3b3eb61e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445","derivation_path":null}],"signatures":null},{"type":"data","value":"67e1a63e43dbd7148aa3ffe5a8e869ff5d89f687d1d29f6224a95bd0ce3b3eb6"}]}],"fee":100000000,"allow_additional_actions":false}`
-       template := txbuilder.Template{}
-       err := json.Unmarshal([]byte(tmplStr), &template)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       estimateResult, err := EstimateTxGas(template)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       baseRate := float64(100000)
-       totalNeu := float64(estimateResult.StorageNeu+estimateResult.VMNeu+flexibleGas*consensus.VMGasRate) / baseRate
-       roundingNeu := math.Ceil(totalNeu)
-       estimateNeu := int64(roundingNeu) * int64(baseRate)
-
-       if estimateResult.TotalNeu != estimateNeu {
-               t.Errorf(`got=%#v; want=%#v`, estimateResult.TotalNeu, estimateNeu)
-       }
-}
-
-func TestEstimateTxGasRange(t *testing.T) {
-
-       cases := []struct {
-               path     string
-               tmplStr  string
-               respWant *EstimateTxGasResp
-       }{
-               {
-                       path:    "/estimate-transaction-gas",
-                       tmplStr: `{"raw_transaction":"0701a8d30201010060015e7e8cf2b20c310f7a8197d598f04a04470eda4d59470661d124b688b507525a9dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80c8afa0250101160014b6fd589b689b2e7a8772c5c0a855734851c2f72a010001013dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8086d8f02401160014b6fd589b689b2e7a8772c5c0a855734851c2f72a00667b2254797065223a3231302c2244617461223a2265794a6d62334a6e5a584a7a496a7062496e5a7a625446784d32316d625752324e6a52714d6e70684d4755326548646c64475a77634745304e326833633368325a7a6b7a5a6e5635655730695858303d227d","signing_instructions":[{"position":0,"witness_components":[{"type":"raw_tx_signature","quorum":1,"keys":[{"xpub":"67e1a63e43dbd7148aa3ffe5a8e869ff5d89f687d1d29f6224a95bd0ce3b3eb61e85cf9855548915e36137345910606cbc8e7dd8497c831dce899ee6ac112445","derivation_path":null}],"signatures":null},{"type":"data","value":"67e1a63e43dbd7148aa3ffe5a8e869ff5d89f687d1d29f6224a95bd0ce3b3eb6"}]}],"fee":100000000,"allow_additional_actions":false}`,
-                       respWant: &EstimateTxGasResp{
-                               TotalNeu: (flexibleGas + 2095) * consensus.VMGasRate,
-                       },
-               },
-               /*
-                       {
-                               path:    "/estimate-transaction-gas",
-                               tmplStr: `{"raw_transaction":"0701a8d30201010060015ef39ac9f5a6b0db3eb4b2a54a8d012ef5626c1da5462bc97c7a0a1c11bd8e39bdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0d6e0ce120001160014b29b9e1b31018d5161e33d0c465bbb6dd1df1556010002013dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc092ebc4120116001468c873fd87f05dc1e6ac5d43cc6889a0338d9ad200013bffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80ea30011600145427f2318811979c908eb2f06d439d134aa156fe00","signing_instructions":[{"position":0,"witness_components":[{"type":"raw_tx_signature","quorum":1,"keys":[{"xpub":"6c420aa025610d323a55c29a8692e2f909b176e88c3bfc8b78cb64ead1bd5db2c6d8492346d12acea177ed0fa4a4579c4bdf020c8cf10fa99cad72f3d5b7de04","derivation_path":["010100000000000000","0e00000000000000"]}],"signatures":null},{"type":"data","value":"512d84b99c93d51729215de3d796390f762f74692306863e3f3bcb0090b399f4"}]}],"allow_additional_actions":false}`,
-                               respWant: &EstimateTxGasResp{
-                                       TotalNeu: (flexibleGas + 3305) * consensus.VMGasRate,
-                               },
-                       },
-                       {
-                               path:    "/estimate-transaction-gas",
-                               tmplStr: `{"raw_transaction":"0701a8d30201010060015ef39ac9f5a6b0db3eb4b2a54a8d012ef5626c1da5462bc97c7a0a1c11bd8e39bdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0d6e0ce120001160014b29b9e1b31018d5161e33d0c465bbb6dd1df1556010002013dffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc0cfb9c01201160014e75b5b89f8398b214c64d0621a19f25d716c2f4700013cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80ade204011600145427f2318811979c908eb2f06d439d134aa156fe00","signing_instructions":[{"position":0,"witness_components":[{"type":"raw_tx_signature","quorum":1,"keys":[{"xpub":"6c420aa025610d323a55c29a8692e2f909b176e88c3bfc8b78cb64ead1bd5db2c6d8492346d12acea177ed0fa4a4579c4bdf020c8cf10fa99cad72f3d5b7de04","derivation_path":["010100000000000000","0e00000000000000"]}],"signatures":null},{"type":"data","value":"512d84b99c93d51729215de3d796390f762f74692306863e3f3bcb0090b399f4"}]}],"allow_additional_actions":false}`,
-                               respWant: &EstimateTxGasResp{
-                                       TotalNeu: (flexibleGas + 13556) * consensus.VMGasRate,
-                               },
-                       },
-               */
-       }
-       for _, c := range cases {
-               template := txbuilder.Template{}
-               err := json.Unmarshal([]byte(c.tmplStr), &template)
-               if err != nil {
-                       t.Fatal(err)
-               }
-               estimateTxGasResp, err := EstimateTxGas(template)
-               realTotalNeu := float64(c.respWant.TotalNeu)
-               rate := math.Abs((float64(estimateTxGasResp.TotalNeu) - realTotalNeu) / float64(estimateTxGasResp.TotalNeu))
-               if rate > 0.2 {
-                       t.Errorf(`the estimateNeu over realNeu 20%%`)
-               }
-       }
-}