@@ -781,16 +781,17 @@ func TestFetchAllAssets(t *testing.T) {
781
781
amt : 777 ,
782
782
scriptKey : scriptKeyWithScript ,
783
783
}}
784
- makeFilter := func (amt uint64 , anchorHeight int32 ,
785
- coinSelectType tapsend.CoinSelectType ) * AssetQueryFilters {
786
-
784
+ makeFilter := func (minAmt , maxAmt uint64 , anchorHeight int32 , scriptKey * asset.ScriptKey , anchorPoint * wire.OutPoint , coinSelectType tapsend.CoinSelectType ) * AssetQueryFilters {
787
785
constraints := tapfreighter.CommitmentConstraints {
788
- MinAmt : amt ,
786
+ MinAmt : minAmt ,
787
+ MaxAmt : maxAmt ,
789
788
CoinSelectType : coinSelectType ,
790
789
}
791
790
return & AssetQueryFilters {
792
791
CommitmentConstraints : constraints ,
793
792
MinAnchorHeight : anchorHeight ,
793
+ ScriptKey : scriptKey ,
794
+ AnchorPoint : anchorPoint ,
794
795
}
795
796
}
796
797
@@ -819,42 +820,66 @@ func TestFetchAllAssets(t *testing.T) {
819
820
numAssets : 10 ,
820
821
}, {
821
822
name : "min amount" ,
822
- filter : makeFilter (12 , 0 , tapsend .ScriptTreesAllowed ),
823
+ filter : makeFilter (12 , 0 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
823
824
numAssets : 2 ,
824
825
}, {
825
826
name : "min amount, include spent" ,
826
- filter : makeFilter (12 , 0 , tapsend .ScriptTreesAllowed ),
827
+ filter : makeFilter (12 , 0 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
827
828
includeSpent : true ,
828
829
numAssets : 4 ,
829
830
}, {
830
831
name : "min amount, include leased" ,
831
- filter : makeFilter (12 , 0 , tapsend .ScriptTreesAllowed ),
832
+ filter : makeFilter (12 , 0 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
832
833
includeLeased : true ,
833
834
numAssets : 5 ,
834
835
}, {
835
836
name : "min amount, include leased, include spent" ,
836
- filter : makeFilter (12 , 0 , tapsend .ScriptTreesAllowed ),
837
+ filter : makeFilter (12 , 0 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
837
838
includeLeased : true ,
838
839
includeSpent : true ,
839
840
numAssets : 8 ,
840
841
}, {
841
842
name : "default min height, include spent" ,
842
- filter : makeFilter (0 , 500 , tapsend .ScriptTreesAllowed ),
843
+ filter : makeFilter (0 , 0 , 500 , nil , nil , tapsend .ScriptTreesAllowed ),
843
844
includeSpent : true ,
844
845
numAssets : 6 ,
845
846
}, {
846
847
name : "specific height" ,
847
- filter : makeFilter (0 , 502 , tapsend .ScriptTreesAllowed ),
848
+ filter : makeFilter (0 , 0 , 502 , nil , nil , tapsend .ScriptTreesAllowed ),
848
849
numAssets : 0 ,
849
850
}, {
850
851
name : "default min height, include spent" ,
851
- filter : makeFilter (0 , 502 , tapsend .ScriptTreesAllowed ),
852
+ filter : makeFilter (0 , 0 , 502 , nil , nil , tapsend .ScriptTreesAllowed ),
852
853
includeSpent : true ,
853
854
numAssets : 1 ,
854
855
}, {
855
856
name : "script key with tapscript" ,
856
- filter : makeFilter (100 , 0 , tapsend .Bip86Only ),
857
+ filter : makeFilter (100 , 0 , 0 , scriptKeyWithScript , nil , tapsend .Bip86Only ),
857
858
numAssets : 0 ,
859
+ }, {
860
+ name : "anchor point" ,
861
+ filter : makeFilter (0 , 0 , 0 , nil , & assetGen .anchorPoints [0 ], tapsend .ScriptTreesAllowed ),
862
+ numAssets : 3 ,
863
+ }, {
864
+ name : "max amount" ,
865
+ filter : makeFilter (0 , 100 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
866
+ numAssets : 4 ,
867
+ }, {
868
+ name : "max amount, include spent" ,
869
+ filter : makeFilter (0 , 100 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
870
+ includeSpent : true ,
871
+ numAssets : 5 ,
872
+ }, {
873
+ name : "max amount, include leased" ,
874
+ filter : makeFilter (0 , 100 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
875
+ includeLeased : true ,
876
+ numAssets : 6 ,
877
+ }, {
878
+ name : "max amount, include leased, include spent" ,
879
+ filter : makeFilter (0 , 100 , 0 , nil , nil , tapsend .ScriptTreesAllowed ),
880
+ includeLeased : true ,
881
+ includeSpent : true ,
882
+ numAssets : 7 ,
858
883
}}
859
884
860
885
// First, we'll create a new assets store and then insert the set of
0 commit comments