Commit ec27e664 authored by Dan Gershony's avatar Dan Gershony

Remove version on the api and add stratis testent to the Breeze drop down

parent 9efd15c0
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<select name="network" formControlName="selectNetwork"> <select name="network" formControlName="selectNetwork">
<!--<option value="main">Main</option>--> <!--<option value="main">Main</option>-->
<option value="test">Testnet</option> <option value="test">Testnet</option>
<option value="stratistest">StratisTest</option>
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
......
...@@ -20,8 +20,8 @@ import { TransactionSending } from '../classes/transaction-sending'; ...@@ -20,8 +20,8 @@ import { TransactionSending } from '../classes/transaction-sending';
export class ApiService { export class ApiService {
constructor(private http: Http) {}; constructor(private http: Http) {};
private mockApiUrl = 'http://localhost:3000/api/v1'; private mockApiUrl = 'http://localhost:3000/api';
private webApiUrl = 'http://localhost:5000/api/v1'; private webApiUrl = 'http://localhost:5000/api';
private headers = new Headers({'Content-Type': 'application/json'}); private headers = new Headers({'Content-Type': 'application/json'});
/** /**
......
...@@ -66,20 +66,6 @@ namespace Breeze.Api ...@@ -66,20 +66,6 @@ namespace Breeze.Api
{ {
setup.SwaggerDoc("v1", new Info { Title = "Breeze.Api", Version = "v1" }); setup.SwaggerDoc("v1", new Info { Title = "Breeze.Api", Version = "v1" });
// FIXME: prepopulates the version in the URL of the Swagger UI found at http://localhost:5000/swagger
// temporary needed until Swashbuckle supports it out-of-the-box
setup.DocInclusionPredicate((version, apiDescription) =>
{
apiDescription.RelativePath = apiDescription.RelativePath.Replace("v{version}", version);
var versionParameter = apiDescription.ParameterDescriptions.SingleOrDefault(p => p.Name == "version");
if (versionParameter != null)
{
apiDescription.ParameterDescriptions.Remove(versionParameter);
}
return true;
});
//Set the comments path for the swagger json and ui. //Set the comments path for the swagger json and ui.
var basePath = PlatformServices.Default.Application.ApplicationBasePath; var basePath = PlatformServices.Default.Application.ApplicationBasePath;
var apiXmlPath = Path.Combine(basePath, "Breeze.Api.xml"); var apiXmlPath = Path.Combine(basePath, "Breeze.Api.xml");
......
...@@ -105,10 +105,7 @@ namespace Breeze.Wallet ...@@ -105,10 +105,7 @@ namespace Breeze.Wallet
public void ProcessBlock(Block block) public void ProcessBlock(Block block)
{ {
var hash = block.Header.GetHash(); this.walletManager.ProcessBlock(block);
var height = this.chain.GetBlock(hash).Height;
this.walletManager.ProcessBlock(height, block);
} }
public void ProcessTransaction(Transaction transaction) public void ProcessTransaction(Transaction transaction)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment