| Revisão | dc2431976febfc912a71b26490d26f4a8b9211a4 (tree) |
|---|---|
| Hora | 2019-10-15 11:10:59 |
| Autor | yahtoo <yahtoo.ma@gmai...> |
| Commiter | Paladz |
account/builder.go (diff) account/builder_test.go (diff) test/builder_test.go (diff)| @@ -20,7 +20,7 @@ var ( | ||
| 20 | 20 | //chainTxUtxoNum maximum utxo quantity in a tx |
| 21 | 21 | chainTxUtxoNum = 20 |
| 22 | 22 | //chainTxMergeGas chain tx gas |
| 23 | - chainTxMergeGas = uint64(10000000) | |
| 23 | + chainTxMergeGas = uint64(0) | |
| 24 | 24 | ) |
| 25 | 25 | |
| 26 | 26 | //DecodeSpendAction unmarshal JSON-encoded data of spend action |
| @@ -354,56 +354,10 @@ func TestMergeSpendAction(t *testing.T) { | ||
| 354 | 354 | } |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | -func TestCalcMergeGas(t *testing.T) { | |
| 358 | - chainTxUtxoNum = 10 | |
| 359 | - cases := []struct { | |
| 360 | - utxoNum int | |
| 361 | - gas uint64 | |
| 362 | - }{ | |
| 363 | - { | |
| 364 | - utxoNum: 0, | |
| 365 | - gas: 0, | |
| 366 | - }, | |
| 367 | - { | |
| 368 | - utxoNum: 1, | |
| 369 | - gas: 0, | |
| 370 | - }, | |
| 371 | - { | |
| 372 | - utxoNum: 9, | |
| 373 | - gas: chainTxMergeGas, | |
| 374 | - }, | |
| 375 | - { | |
| 376 | - utxoNum: 10, | |
| 377 | - gas: chainTxMergeGas, | |
| 378 | - }, | |
| 379 | - { | |
| 380 | - utxoNum: 11, | |
| 381 | - gas: chainTxMergeGas * 2, | |
| 382 | - }, | |
| 383 | - { | |
| 384 | - utxoNum: 20, | |
| 385 | - gas: chainTxMergeGas * 3, | |
| 386 | - }, | |
| 387 | - { | |
| 388 | - utxoNum: 21, | |
| 389 | - gas: chainTxMergeGas * 3, | |
| 390 | - }, | |
| 391 | - { | |
| 392 | - utxoNum: 74, | |
| 393 | - gas: chainTxMergeGas * 9, | |
| 394 | - }, | |
| 395 | - } | |
| 396 | - | |
| 397 | - for i, c := range cases { | |
| 398 | - gas := calcMergeGas(c.utxoNum) | |
| 399 | - if gas != c.gas { | |
| 400 | - t.Fatalf("case %d got %d want %d", i, gas, c.gas) | |
| 401 | - } | |
| 402 | - } | |
| 403 | -} | |
| 404 | - | |
| 405 | 357 | func TestReserveBtmUtxoChain(t *testing.T) { |
| 406 | 358 | chainTxUtxoNum = 3 |
| 359 | + chainTxMergeGas = uint64(10000000) | |
| 360 | + | |
| 407 | 361 | utxos := []*UTXO{} |
| 408 | 362 | m := mockAccountManager(t) |
| 409 | 363 | for i := uint64(1); i <= 20; i++ { |
| @@ -13,8 +13,6 @@ import ( | ||
| 13 | 13 | var ( |
| 14 | 14 | //chainTxUtxoNum maximum utxo quantity in a tx |
| 15 | 15 | chainTxUtxoNum = 5 |
| 16 | - //chainTxMergeGas chain tx gas | |
| 17 | - chainTxMergeGas = uint64(10000000) | |
| 18 | 16 | ) |
| 19 | 17 | |
| 20 | 18 | func TestBuildBtmTxChain(t *testing.T) { |
| @@ -30,7 +28,7 @@ func TestBuildBtmTxChain(t *testing.T) { | ||
| 30 | 28 | inputUtxo: []uint64{5}, |
| 31 | 29 | wantInput: [][]uint64{}, |
| 32 | 30 | wantOutput: [][]uint64{}, |
| 33 | - wantUtxo: 5 * chainTxMergeGas, | |
| 31 | + wantUtxo: 5, | |
| 34 | 32 | }, |
| 35 | 33 | { |
| 36 | 34 | inputUtxo: []uint64{5, 4}, |
| @@ -38,9 +36,9 @@ func TestBuildBtmTxChain(t *testing.T) { | ||
| 38 | 36 | []uint64{5, 4}, |
| 39 | 37 | }, |
| 40 | 38 | wantOutput: [][]uint64{ |
| 41 | - []uint64{8}, | |
| 39 | + []uint64{9}, | |
| 42 | 40 | }, |
| 43 | - wantUtxo: 8 * chainTxMergeGas, | |
| 41 | + wantUtxo: 9, | |
| 44 | 42 | }, |
| 45 | 43 | { |
| 46 | 44 | inputUtxo: []uint64{5, 4, 1, 1}, |
| @@ -49,22 +47,22 @@ func TestBuildBtmTxChain(t *testing.T) { | ||
| 49 | 47 | []uint64{1, 9}, |
| 50 | 48 | }, |
| 51 | 49 | wantOutput: [][]uint64{ |
| 50 | + []uint64{11}, | |
| 52 | 51 | []uint64{10}, |
| 53 | - []uint64{9}, | |
| 54 | 52 | }, |
| 55 | - wantUtxo: 10 * chainTxMergeGas, | |
| 53 | + wantUtxo: 11, | |
| 56 | 54 | }, |
| 57 | 55 | { |
| 58 | 56 | inputUtxo: []uint64{22, 123, 53, 234, 23, 4, 2423, 24, 23, 43, 34, 234, 234, 24, 11, 16, 33, 59, 73, 89, 66}, |
| 59 | 57 | wantInput: [][]uint64{ |
| 60 | 58 | []uint64{22, 123, 53, 234, 23, 4, 2423, 24, 23, 43, 34, 234, 234, 24, 11, 16, 33, 59, 73, 89}, |
| 61 | - []uint64{66, 3778}, | |
| 59 | + []uint64{66, 3779}, | |
| 62 | 60 | }, |
| 63 | 61 | wantOutput: [][]uint64{ |
| 64 | - []uint64{3778}, | |
| 65 | - []uint64{3843}, | |
| 62 | + []uint64{3779}, | |
| 63 | + []uint64{3845}, | |
| 66 | 64 | }, |
| 67 | - wantUtxo: 3843 * chainTxMergeGas, | |
| 65 | + wantUtxo: 3845, | |
| 68 | 66 | }, |
| 69 | 67 | } |
| 70 | 68 |
| @@ -82,7 +80,7 @@ func TestBuildBtmTxChain(t *testing.T) { | ||
| 82 | 80 | utxos := []*acc.UTXO{} |
| 83 | 81 | for _, amount := range c.inputUtxo { |
| 84 | 82 | utxos = append(utxos, &acc.UTXO{ |
| 85 | - Amount: amount * chainTxMergeGas, | |
| 83 | + Amount: amount, | |
| 86 | 84 | AssetID: *consensus.BTMAssetID, |
| 87 | 85 | Address: acp.Address, |
| 88 | 86 | ControlProgram: acp.ControlProgram, |
| @@ -97,12 +95,12 @@ func TestBuildBtmTxChain(t *testing.T) { | ||
| 97 | 95 | for i, tpl := range tpls { |
| 98 | 96 | gotInput := []uint64{} |
| 99 | 97 | for _, input := range tpl.Transaction.Inputs { |
| 100 | - gotInput = append(gotInput, input.Amount()/chainTxMergeGas) | |
| 98 | + gotInput = append(gotInput, input.Amount()) | |
| 101 | 99 | } |
| 102 | 100 | |
| 103 | 101 | gotOutput := []uint64{} |
| 104 | 102 | for _, output := range tpl.Transaction.Outputs { |
| 105 | - gotOutput = append(gotOutput, output.AssetAmount().Amount/chainTxMergeGas) | |
| 103 | + gotOutput = append(gotOutput, output.AssetAmount().Amount) | |
| 106 | 104 | } |
| 107 | 105 | |
| 108 | 106 | if !testutil.DeepEqual(c.wantInput[i], gotInput) { |
Fork