OSDN Git Service

fix_mov_contract_test (#510)
authorPoseidon <shenao.78@163.com>
Tue, 10 Mar 2020 10:16:56 +0000 (18:16 +0800)
committerGitHub <noreply@github.com>
Tue, 10 Mar 2020 10:16:56 +0000 (18:16 +0800)
protocol/validation/tx_test.go

index d71f233..3c3ab21 100644 (file)
@@ -922,8 +922,10 @@ func TestMagneticContractTx(t *testing.T) {
                                                        types.NewSpendInput([][]byte{vm.Int64Bytes(1), vm.Int64Bytes(1)}, bc.Hash{V0: 20}, sellerArgs.RequestedAsset, 200000000, 0, programBuyer),
                                                },
                                                Outputs: []*types.TxOutput{
-                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 200000000, sellerArgs.SellerProgram),
-                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 100000000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 199800000, sellerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 99900000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 200000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 100000, []byte{0x51}),
                                                },
                                        }),
                                },
@@ -942,9 +944,11 @@ func TestMagneticContractTx(t *testing.T) {
                                                        types.NewSpendInput([][]byte{vm.Int64Bytes(2), vm.Int64Bytes(1)}, bc.Hash{V0: 20}, sellerArgs.RequestedAsset, 100000000, 0, programBuyer),
                                                },
                                                Outputs: []*types.TxOutput{
-                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 100000000, sellerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 99900000, sellerArgs.SellerProgram),
                                                        types.NewIntraChainOutput(buyerArgs.RequestedAsset, 150000000, programSeller),
-                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 50000000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 49950000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 100000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 50000, []byte{0x51}),
                                                },
                                        }),
                                },
@@ -963,9 +967,11 @@ func TestMagneticContractTx(t *testing.T) {
                                                        types.NewSpendInput([][]byte{vm.Int64Bytes(100000000), vm.Int64Bytes(1), vm.Int64Bytes(0)}, bc.Hash{V0: 20}, sellerArgs.RequestedAsset, 300000000, 0, programBuyer),
                                                },
                                                Outputs: []*types.TxOutput{
-                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 200000000, sellerArgs.SellerProgram),
-                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 100000000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 199800000, sellerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 99900000, buyerArgs.SellerProgram),
                                                        types.NewIntraChainOutput(sellerArgs.RequestedAsset, 100000000, programBuyer),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 200000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 100000, []byte{0x51}),
                                                },
                                        }),
                                },
@@ -1063,9 +1069,11 @@ func TestMagneticContractTx(t *testing.T) {
                                                        types.NewSpendInput([][]byte{vm.Int64Bytes(2), vm.Int64Bytes(1)}, bc.Hash{V0: 20}, sellerArgs.RequestedAsset, 100000000, 0, programBuyer),
                                                },
                                                Outputs: []*types.TxOutput{
-                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 100000000, sellerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 99900000, sellerArgs.SellerProgram),
                                                        types.NewIntraChainOutput(buyerArgs.RequestedAsset, 150000000, []byte{0x55}),
-                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 50000000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 49950000, buyerArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(sellerArgs.RequestedAsset, 100000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(buyerArgs.RequestedAsset, 50000, []byte{0x51}),
                                                },
                                        }),
                                },
@@ -1139,9 +1147,12 @@ func TestRingMagneticContractTx(t *testing.T) {
                                                        types.NewSpendInput([][]byte{vm.Int64Bytes(2), vm.Int64Bytes(1)}, bc.Hash{V0: 30}, bobArgs.RequestedAsset, 400000000, 0, jackProgram),
                                                },
                                                Outputs: []*types.TxOutput{
-                                                       types.NewIntraChainOutput(aliceArgs.RequestedAsset, 200000000, aliceArgs.SellerProgram),
-                                                       types.NewIntraChainOutput(bobArgs.RequestedAsset, 400000000, bobArgs.SellerProgram),
-                                                       types.NewIntraChainOutput(jackArgs.RequestedAsset, 100000000, jackArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(aliceArgs.RequestedAsset, 199800000, aliceArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(bobArgs.RequestedAsset, 399600000, bobArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(jackArgs.RequestedAsset, 99900000, jackArgs.SellerProgram),
+                                                       types.NewIntraChainOutput(aliceArgs.RequestedAsset, 200000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(bobArgs.RequestedAsset, 400000, []byte{0x51}),
+                                                       types.NewIntraChainOutput(jackArgs.RequestedAsset, 100000, []byte{0x51}),
                                                },
                                        }),
                                },